diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/ArmDeviceRegistryModelFactory.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/ArmDeviceRegistryModelFactory.cs
index 23be7c4b75af..8983de055604 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/ArmDeviceRegistryModelFactory.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/ArmDeviceRegistryModelFactory.cs
@@ -236,7 +236,7 @@ public static DeviceRegistryBillingContainerData DeviceRegistryBillingContainerD
                 serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistry.DeviceRegistryNamespaceData"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="DeviceRegistry.NamespaceData"/>. </summary>
         /// <param name="id"> The id. </param>
         /// <param name="name"> The name. </param>
         /// <param name="resourceType"> The resourceType. </param>
@@ -245,12 +245,12 @@ public static DeviceRegistryBillingContainerData DeviceRegistryBillingContainerD
         /// <param name="location"> The location. </param>
         /// <param name="properties"> The resource-specific properties for this resource. </param>
         /// <param name="identity"> The managed service identities assigned to this resource. Current supported identity types: None, SystemAssigned. </param>
-        /// <returns> A new <see cref="DeviceRegistry.DeviceRegistryNamespaceData"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceData DeviceRegistryNamespaceData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IDictionary<string, string> tags = null, AzureLocation location = default, DeviceRegistryNamespaceProperties properties = null, ManagedServiceIdentity identity = null)
+        /// <returns> A new <see cref="DeviceRegistry.NamespaceData"/> instance for mocking. </returns>
+        public static NamespaceData NamespaceData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IDictionary<string, string> tags = null, AzureLocation location = default, NamespaceProperties properties = null, ManagedServiceIdentity identity = null)
         {
             tags ??= new Dictionary<string, string>();
 
-            return new DeviceRegistryNamespaceData(
+            return new NamespaceData(
                 id,
                 name,
                 resourceType,
@@ -262,30 +262,30 @@ public static DeviceRegistryNamespaceData DeviceRegistryNamespaceData(ResourceId
                 serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryNamespaceProperties"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.NamespaceProperties"/>. </summary>
         /// <param name="uuid"> Globally unique, immutable, non-reusable ID. </param>
         /// <param name="messagingEndpoints"> Assigned and unassigned messaging endpoints. </param>
         /// <param name="provisioningState"> Provisioning state of the resource. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryNamespaceProperties"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceProperties DeviceRegistryNamespaceProperties(string uuid = null, IDictionary<string, MessagingEndpoint> messagingEndpoints = null, DeviceRegistryProvisioningState? provisioningState = null)
+        /// <returns> A new <see cref="Models.NamespaceProperties"/> instance for mocking. </returns>
+        public static NamespaceProperties NamespaceProperties(string uuid = null, IDictionary<string, MessagingEndpoint> messagingEndpoints = null, DeviceRegistryProvisioningState? provisioningState = null)
         {
             messagingEndpoints ??= new Dictionary<string, MessagingEndpoint>();
 
-            return new DeviceRegistryNamespaceProperties(uuid, messagingEndpoints != null ? new Messaging(messagingEndpoints, serializedAdditionalRawData: null) : null, provisioningState, serializedAdditionalRawData: null);
+            return new NamespaceProperties(uuid, messagingEndpoints != null ? new Messaging(messagingEndpoints, serializedAdditionalRawData: null) : null, provisioningState, serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryErrorDetails"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.ErrorDetails"/>. </summary>
         /// <param name="code"> Multi-part error code for classification and root causing of errors (ex: 400.200.100.432). </param>
         /// <param name="message"> Human-readable helpful error message to provide additional context for error (ex: “Authentication method not supported”). </param>
         /// <param name="info"> Human-readable helpful detailed text context for debugging (ex: “The following mechanisms are supported...”). </param>
         /// <param name="correlationId"> Unique identifier for the transaction to aid in debugging. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryErrorDetails"/> instance for mocking. </returns>
-        public static DeviceRegistryErrorDetails DeviceRegistryErrorDetails(string code = null, string message = null, string info = null, string correlationId = null)
+        /// <returns> A new <see cref="Models.ErrorDetails"/> instance for mocking. </returns>
+        public static ErrorDetails ErrorDetails(string code = null, string message = null, string info = null, string correlationId = null)
         {
-            return new DeviceRegistryErrorDetails(code, message, info, correlationId, serializedAdditionalRawData: null);
+            return new ErrorDetails(code, message, info, correlationId, serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistry.DeviceRegistryNamespaceAssetData"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="DeviceRegistry.NamespaceAssetData"/>. </summary>
         /// <param name="id"> The id. </param>
         /// <param name="name"> The name. </param>
         /// <param name="resourceType"> The resourceType. </param>
@@ -294,12 +294,12 @@ public static DeviceRegistryErrorDetails DeviceRegistryErrorDetails(string code
         /// <param name="location"> The location. </param>
         /// <param name="properties"> The resource-specific properties for this resource. </param>
         /// <param name="extendedLocation"> The extended location. </param>
-        /// <returns> A new <see cref="DeviceRegistry.DeviceRegistryNamespaceAssetData"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceAssetData DeviceRegistryNamespaceAssetData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IDictionary<string, string> tags = null, AzureLocation location = default, DeviceRegistryNamespaceAssetProperties properties = null, DeviceRegistryExtendedLocation extendedLocation = null)
+        /// <returns> A new <see cref="DeviceRegistry.NamespaceAssetData"/> instance for mocking. </returns>
+        public static NamespaceAssetData NamespaceAssetData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IDictionary<string, string> tags = null, AzureLocation location = default, NamespaceAssetProperties properties = null, DeviceRegistryExtendedLocation extendedLocation = null)
         {
             tags ??= new Dictionary<string, string>();
 
-            return new DeviceRegistryNamespaceAssetData(
+            return new NamespaceAssetData(
                 id,
                 name,
                 resourceType,
@@ -311,7 +311,7 @@ public static DeviceRegistryNamespaceAssetData DeviceRegistryNamespaceAssetData(
                 serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryNamespaceAssetProperties"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.NamespaceAssetProperties"/>. </summary>
         /// <param name="uuid"> Globally unique, immutable, non-reusable ID. </param>
         /// <param name="enabled"> Enabled/disabled status of the asset. </param>
         /// <param name="externalAssetId"> Asset ID provided by the customer. </param>
@@ -356,8 +356,8 @@ public static DeviceRegistryNamespaceAssetData DeviceRegistryNamespaceAssetData(
         /// <param name="managementGroups"> Array of management groups that are part of the asset. Each management group can have a per-group configuration. </param>
         /// <param name="status"> Read only object to reflect changes that have occurred on the Edge. Similar to Kubernetes status property for custom resources. </param>
         /// <param name="provisioningState"> Provisioning state of the resource. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryNamespaceAssetProperties"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceAssetProperties DeviceRegistryNamespaceAssetProperties(string uuid = null, bool? enabled = null, string externalAssetId = null, string displayName = null, string description = null, DeviceRef deviceRef = null, IEnumerable<string> assetTypeRefs = null, long? version = null, DateTimeOffset? lastTransitionOn = null, string manufacturer = null, string manufacturerUri = null, string model = null, string productCode = null, string hardwareRevision = null, string softwareRevision = null, string documentationUri = null, string serialNumber = null, IDictionary<string, BinaryData> attributes = null, IEnumerable<string> discoveredAssetRefs = null, string defaultDatasetsConfiguration = null, string defaultEventsConfiguration = null, string defaultStreamsConfiguration = null, string defaultManagementGroupsConfiguration = null, IEnumerable<DatasetDestination> defaultDatasetsDestinations = null, IEnumerable<EventDestination> defaultEventsDestinations = null, IEnumerable<StreamDestination> defaultStreamsDestinations = null, IEnumerable<NamespaceDataset> datasets = null, IEnumerable<NamespaceEventGroup> eventGroups = null, IEnumerable<NamespaceStream> streams = null, IEnumerable<ManagementGroup> managementGroups = null, DeviceRegistryNamespaceAssetStatus status = null, DeviceRegistryProvisioningState? provisioningState = null)
+        /// <returns> A new <see cref="Models.NamespaceAssetProperties"/> instance for mocking. </returns>
+        public static NamespaceAssetProperties NamespaceAssetProperties(string uuid = null, bool? enabled = null, string externalAssetId = null, string displayName = null, string description = null, DeviceRef deviceRef = null, IEnumerable<string> assetTypeRefs = null, long? version = null, DateTimeOffset? lastTransitionOn = null, string manufacturer = null, string manufacturerUri = null, string model = null, string productCode = null, string hardwareRevision = null, string softwareRevision = null, string documentationUri = null, string serialNumber = null, IDictionary<string, BinaryData> attributes = null, IEnumerable<string> discoveredAssetRefs = null, string defaultDatasetsConfiguration = null, string defaultEventsConfiguration = null, string defaultStreamsConfiguration = null, string defaultManagementGroupsConfiguration = null, IEnumerable<DatasetDestination> defaultDatasetsDestinations = null, IEnumerable<EventDestination> defaultEventsDestinations = null, IEnumerable<StreamDestination> defaultStreamsDestinations = null, IEnumerable<NamespaceDataset> datasets = null, IEnumerable<NamespaceEventGroup> eventGroups = null, IEnumerable<NamespaceStream> streams = null, IEnumerable<ManagementGroup> managementGroups = null, NamespaceAssetStatus status = null, DeviceRegistryProvisioningState? provisioningState = null)
         {
             assetTypeRefs ??= new List<string>();
             attributes ??= new Dictionary<string, BinaryData>();
@@ -370,7 +370,7 @@ public static DeviceRegistryNamespaceAssetProperties DeviceRegistryNamespaceAsse
             streams ??= new List<NamespaceStream>();
             managementGroups ??= new List<ManagementGroup>();
 
-            return new DeviceRegistryNamespaceAssetProperties(
+            return new NamespaceAssetProperties(
                 uuid,
                 enabled,
                 externalAssetId,
@@ -406,21 +406,21 @@ public static DeviceRegistryNamespaceAssetProperties DeviceRegistryNamespaceAsse
                 serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryNamespaceAssetStatus"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.NamespaceAssetStatus"/>. </summary>
         /// <param name="config"> Defines the asset status config properties. </param>
         /// <param name="datasets"> Array of dataset statuses that describe the status of each dataset. </param>
         /// <param name="eventGroups"> Array of event group statuses that describe the status of each event group. </param>
         /// <param name="streams"> Array of stream statuses that describe the status of each stream. </param>
         /// <param name="managementGroups"> Array of management group statuses that describe the status of each management group. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryNamespaceAssetStatus"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceAssetStatus DeviceRegistryNamespaceAssetStatus(DeviceRegistryStatusConfig config = null, IEnumerable<DeviceRegistryNamespaceAssetStatusDataset> datasets = null, IEnumerable<DeviceRegistryNamespaceAssetStatusEventGroup> eventGroups = null, IEnumerable<DeviceRegistryNamespaceAssetStatusStream> streams = null, IEnumerable<DeviceRegistryNamespaceAssetStatusManagementGroup> managementGroups = null)
+        /// <returns> A new <see cref="Models.NamespaceAssetStatus"/> instance for mocking. </returns>
+        public static NamespaceAssetStatus NamespaceAssetStatus(StatusConfig config = null, IEnumerable<NamespaceAssetStatusDataset> datasets = null, IEnumerable<NamespaceAssetStatusEventGroup> eventGroups = null, IEnumerable<NamespaceAssetStatusStream> streams = null, IEnumerable<NamespaceAssetStatusManagementGroup> managementGroups = null)
         {
-            datasets ??= new List<DeviceRegistryNamespaceAssetStatusDataset>();
-            eventGroups ??= new List<DeviceRegistryNamespaceAssetStatusEventGroup>();
-            streams ??= new List<DeviceRegistryNamespaceAssetStatusStream>();
-            managementGroups ??= new List<DeviceRegistryNamespaceAssetStatusManagementGroup>();
+            datasets ??= new List<NamespaceAssetStatusDataset>();
+            eventGroups ??= new List<NamespaceAssetStatusEventGroup>();
+            streams ??= new List<NamespaceAssetStatusStream>();
+            managementGroups ??= new List<NamespaceAssetStatusManagementGroup>();
 
-            return new DeviceRegistryNamespaceAssetStatus(
+            return new NamespaceAssetStatus(
                 config,
                 datasets?.ToList(),
                 eventGroups?.ToList(),
@@ -429,102 +429,102 @@ public static DeviceRegistryNamespaceAssetStatus DeviceRegistryNamespaceAssetSta
                 serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryStatusConfig"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.StatusConfig"/>. </summary>
         /// <param name="version"> A read-only incremental counter indicating the number of times the configuration has been modified from the perspective of the current actual (edge) state of the CRD. Edge would be the only writer of this value and would sync back up to the cloud. In steady state, this should equal version. </param>
         /// <param name="lastTransitionOn"> A read-only timestamp indicating the last time the configuration has been modified from the perspective of the current actual (edge) state of the CRD. Edge would be the only writer of this value and would sync back up to the cloud. </param>
         /// <param name="error"> Object to transfer and persist errors that originate from the edge. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryStatusConfig"/> instance for mocking. </returns>
-        public static DeviceRegistryStatusConfig DeviceRegistryStatusConfig(long? version = null, DateTimeOffset? lastTransitionOn = null, DeviceRegistryStatusError error = null)
+        /// <returns> A new <see cref="Models.StatusConfig"/> instance for mocking. </returns>
+        public static StatusConfig StatusConfig(long? version = null, DateTimeOffset? lastTransitionOn = null, StatusError error = null)
         {
-            return new DeviceRegistryStatusConfig(version, lastTransitionOn, error, serializedAdditionalRawData: null);
+            return new StatusConfig(version, lastTransitionOn, error, serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryStatusError"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.StatusError"/>. </summary>
         /// <param name="code"> Error code for classification of errors (ex: '400', '404', '500', etc.). </param>
         /// <param name="message"> Human-readable helpful error message to provide additional context for error (e.g.,: “Capability ID 'foo' does not exist”). </param>
         /// <param name="details"> Array of error details that describe the status of each error. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryStatusError"/> instance for mocking. </returns>
-        public static DeviceRegistryStatusError DeviceRegistryStatusError(string code = null, string message = null, IEnumerable<DeviceRegistryErrorDetails> details = null)
+        /// <returns> A new <see cref="Models.StatusError"/> instance for mocking. </returns>
+        public static StatusError StatusError(string code = null, string message = null, IEnumerable<ErrorDetails> details = null)
         {
-            details ??= new List<DeviceRegistryErrorDetails>();
+            details ??= new List<ErrorDetails>();
 
-            return new DeviceRegistryStatusError(code, message, details?.ToList(), serializedAdditionalRawData: null);
+            return new StatusError(code, message, details?.ToList(), serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryNamespaceAssetStatusDataset"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.NamespaceAssetStatusDataset"/>. </summary>
         /// <param name="name"> The name of the dataset. Must be unique within the status.datasets array. This name is used to correlate between the spec and status dataset information. </param>
         /// <param name="messageSchemaReference"> The message schema reference object. </param>
         /// <param name="error"> Object to transfer and persist errors that originate from the edge. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryNamespaceAssetStatusDataset"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceAssetStatusDataset DeviceRegistryNamespaceAssetStatusDataset(string name = null, DeviceRegistryNamespaceMessageSchemaReference messageSchemaReference = null, DeviceRegistryStatusError error = null)
+        /// <returns> A new <see cref="Models.NamespaceAssetStatusDataset"/> instance for mocking. </returns>
+        public static NamespaceAssetStatusDataset NamespaceAssetStatusDataset(string name = null, NamespaceMessageSchemaReference messageSchemaReference = null, StatusError error = null)
         {
-            return new DeviceRegistryNamespaceAssetStatusDataset(name, messageSchemaReference, error, serializedAdditionalRawData: null);
+            return new NamespaceAssetStatusDataset(name, messageSchemaReference, error, serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryNamespaceMessageSchemaReference"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.NamespaceMessageSchemaReference"/>. </summary>
         /// <param name="schemaRegistryNamespace"> The message schema registry namespace. </param>
         /// <param name="schemaName"> The message schema name. </param>
         /// <param name="schemaVersion"> The message schema version. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryNamespaceMessageSchemaReference"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceMessageSchemaReference DeviceRegistryNamespaceMessageSchemaReference(string schemaRegistryNamespace = null, string schemaName = null, string schemaVersion = null)
+        /// <returns> A new <see cref="Models.NamespaceMessageSchemaReference"/> instance for mocking. </returns>
+        public static NamespaceMessageSchemaReference NamespaceMessageSchemaReference(string schemaRegistryNamespace = null, string schemaName = null, string schemaVersion = null)
         {
-            return new DeviceRegistryNamespaceMessageSchemaReference(schemaRegistryNamespace, schemaName, schemaVersion, serializedAdditionalRawData: null);
+            return new NamespaceMessageSchemaReference(schemaRegistryNamespace, schemaName, schemaVersion, serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryNamespaceAssetStatusEventGroup"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.NamespaceAssetStatusEventGroup"/>. </summary>
         /// <param name="name"> The name of the event group. Must be unique within the status.eventGroups array. This name is used to correlate between the spec and status event group information. </param>
         /// <param name="events"> Array of event statuses that describe the status of each event in the event group. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryNamespaceAssetStatusEventGroup"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceAssetStatusEventGroup DeviceRegistryNamespaceAssetStatusEventGroup(string name = null, IEnumerable<DeviceRegistryNamespaceAssetStatusEvent> events = null)
+        /// <returns> A new <see cref="Models.NamespaceAssetStatusEventGroup"/> instance for mocking. </returns>
+        public static NamespaceAssetStatusEventGroup NamespaceAssetStatusEventGroup(string name = null, IEnumerable<NamespaceAssetStatusEvent> events = null)
         {
-            events ??= new List<DeviceRegistryNamespaceAssetStatusEvent>();
+            events ??= new List<NamespaceAssetStatusEvent>();
 
-            return new DeviceRegistryNamespaceAssetStatusEventGroup(name, events?.ToList(), serializedAdditionalRawData: null);
+            return new NamespaceAssetStatusEventGroup(name, events?.ToList(), serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryNamespaceAssetStatusEvent"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.NamespaceAssetStatusEvent"/>. </summary>
         /// <param name="name"> The name of the event. Must be unique within the status.events array. This name is used to correlate between the spec and status event information. </param>
         /// <param name="messageSchemaReference"> The message schema reference object. </param>
         /// <param name="error"> Object to transfer and persist errors that originate from the edge. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryNamespaceAssetStatusEvent"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceAssetStatusEvent DeviceRegistryNamespaceAssetStatusEvent(string name = null, DeviceRegistryNamespaceMessageSchemaReference messageSchemaReference = null, DeviceRegistryStatusError error = null)
+        /// <returns> A new <see cref="Models.NamespaceAssetStatusEvent"/> instance for mocking. </returns>
+        public static NamespaceAssetStatusEvent NamespaceAssetStatusEvent(string name = null, NamespaceMessageSchemaReference messageSchemaReference = null, StatusError error = null)
         {
-            return new DeviceRegistryNamespaceAssetStatusEvent(name, messageSchemaReference, error, serializedAdditionalRawData: null);
+            return new NamespaceAssetStatusEvent(name, messageSchemaReference, error, serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryNamespaceAssetStatusStream"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.NamespaceAssetStatusStream"/>. </summary>
         /// <param name="name"> The name of the stream. Must be unique within the status.streams array. This name is used to correlate between the spec and status event information. </param>
         /// <param name="messageSchemaReference"> The message schema reference object. </param>
         /// <param name="error"> Object to transfer and persist errors that originate from the edge. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryNamespaceAssetStatusStream"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceAssetStatusStream DeviceRegistryNamespaceAssetStatusStream(string name = null, DeviceRegistryNamespaceMessageSchemaReference messageSchemaReference = null, DeviceRegistryStatusError error = null)
+        /// <returns> A new <see cref="Models.NamespaceAssetStatusStream"/> instance for mocking. </returns>
+        public static NamespaceAssetStatusStream NamespaceAssetStatusStream(string name = null, NamespaceMessageSchemaReference messageSchemaReference = null, StatusError error = null)
         {
-            return new DeviceRegistryNamespaceAssetStatusStream(name, messageSchemaReference, error, serializedAdditionalRawData: null);
+            return new NamespaceAssetStatusStream(name, messageSchemaReference, error, serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryNamespaceAssetStatusManagementGroup"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.NamespaceAssetStatusManagementGroup"/>. </summary>
         /// <param name="name"> The name of the management group. Must be unique within the status.managementGroups array. This name is used to correlate between the spec and status event information. </param>
         /// <param name="actions"> Array of action statuses that describe the status of each action. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryNamespaceAssetStatusManagementGroup"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceAssetStatusManagementGroup DeviceRegistryNamespaceAssetStatusManagementGroup(string name = null, IEnumerable<DeviceRegistryNamespaceAssetStatusManagementAction> actions = null)
+        /// <returns> A new <see cref="Models.NamespaceAssetStatusManagementGroup"/> instance for mocking. </returns>
+        public static NamespaceAssetStatusManagementGroup NamespaceAssetStatusManagementGroup(string name = null, IEnumerable<NamespaceAssetStatusManagementAction> actions = null)
         {
-            actions ??= new List<DeviceRegistryNamespaceAssetStatusManagementAction>();
+            actions ??= new List<NamespaceAssetStatusManagementAction>();
 
-            return new DeviceRegistryNamespaceAssetStatusManagementGroup(name, actions?.ToList(), serializedAdditionalRawData: null);
+            return new NamespaceAssetStatusManagementGroup(name, actions?.ToList(), serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryNamespaceAssetStatusManagementAction"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.NamespaceAssetStatusManagementAction"/>. </summary>
         /// <param name="name"> The name of the action. Must be unique within the status.actions array. This name is used to correlate between the spec and status event information. </param>
         /// <param name="requestMessageSchemaReference"> The request message schema reference object for the action. </param>
         /// <param name="responseMessageSchemaReference"> The response message schema reference object for the action. </param>
         /// <param name="error"> Object to transfer and persist errors that originate from the edge. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryNamespaceAssetStatusManagementAction"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceAssetStatusManagementAction DeviceRegistryNamespaceAssetStatusManagementAction(string name = null, DeviceRegistryNamespaceMessageSchemaReference requestMessageSchemaReference = null, DeviceRegistryNamespaceMessageSchemaReference responseMessageSchemaReference = null, DeviceRegistryStatusError error = null)
+        /// <returns> A new <see cref="Models.NamespaceAssetStatusManagementAction"/> instance for mocking. </returns>
+        public static NamespaceAssetStatusManagementAction NamespaceAssetStatusManagementAction(string name = null, NamespaceMessageSchemaReference requestMessageSchemaReference = null, NamespaceMessageSchemaReference responseMessageSchemaReference = null, StatusError error = null)
         {
-            return new DeviceRegistryNamespaceAssetStatusManagementAction(name, requestMessageSchemaReference, responseMessageSchemaReference, error, serializedAdditionalRawData: null);
+            return new NamespaceAssetStatusManagementAction(name, requestMessageSchemaReference, responseMessageSchemaReference, error, serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistry.DeviceRegistryNamespaceDeviceData"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="DeviceRegistry.NamespaceDeviceData"/>. </summary>
         /// <param name="id"> The id. </param>
         /// <param name="name"> The name. </param>
         /// <param name="resourceType"> The resourceType. </param>
@@ -534,12 +534,12 @@ public static DeviceRegistryNamespaceAssetStatusManagementAction DeviceRegistryN
         /// <param name="properties"> The resource-specific properties for this resource. </param>
         /// <param name="etag"> Resource Tag. </param>
         /// <param name="extendedLocation"> The extended location. </param>
-        /// <returns> A new <see cref="DeviceRegistry.DeviceRegistryNamespaceDeviceData"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceDeviceData DeviceRegistryNamespaceDeviceData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IDictionary<string, string> tags = null, AzureLocation location = default, DeviceRegistryNamespaceDeviceProperties properties = null, string etag = null, DeviceRegistryExtendedLocation extendedLocation = null)
+        /// <returns> A new <see cref="DeviceRegistry.NamespaceDeviceData"/> instance for mocking. </returns>
+        public static NamespaceDeviceData NamespaceDeviceData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IDictionary<string, string> tags = null, AzureLocation location = default, NamespaceDeviceProperties properties = null, string etag = null, DeviceRegistryExtendedLocation extendedLocation = null)
         {
             tags ??= new Dictionary<string, string>();
 
-            return new DeviceRegistryNamespaceDeviceData(
+            return new NamespaceDeviceData(
                 id,
                 name,
                 resourceType,
@@ -552,7 +552,7 @@ public static DeviceRegistryNamespaceDeviceData DeviceRegistryNamespaceDeviceDat
                 serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryNamespaceDeviceProperties"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.NamespaceDeviceProperties"/>. </summary>
         /// <param name="uuid"> A unique identifier for the device. </param>
         /// <param name="enabled"> Indicates if the resource is enabled or not. </param>
         /// <param name="externalDeviceId"> The Device ID provided by the customer. </param>
@@ -567,12 +567,12 @@ public static DeviceRegistryNamespaceDeviceData DeviceRegistryNamespaceDeviceDat
         /// <param name="version"> An integer that is incremented each time the resource is modified. </param>
         /// <param name="lastTransitionOn"> A timestamp (in UTC) that is updated each time the resource is modified. </param>
         /// <param name="provisioningState"> Provisioning state of the resource. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryNamespaceDeviceProperties"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceDeviceProperties DeviceRegistryNamespaceDeviceProperties(string uuid = null, bool? enabled = null, string externalDeviceId = null, string discoveredDeviceRef = null, string manufacturer = null, string model = null, string operatingSystem = null, string operatingSystemVersion = null, MessagingEndpoints endpoints = null, IDictionary<string, BinaryData> attributes = null, DeviceStatus status = null, long? version = null, DateTimeOffset? lastTransitionOn = null, DeviceRegistryProvisioningState? provisioningState = null)
+        /// <returns> A new <see cref="Models.NamespaceDeviceProperties"/> instance for mocking. </returns>
+        public static NamespaceDeviceProperties NamespaceDeviceProperties(string uuid = null, bool? enabled = null, string externalDeviceId = null, string discoveredDeviceRef = null, string manufacturer = null, string model = null, string operatingSystem = null, string operatingSystemVersion = null, MessagingEndpoints endpoints = null, IDictionary<string, BinaryData> attributes = null, DeviceStatus status = null, long? version = null, DateTimeOffset? lastTransitionOn = null, DeviceRegistryProvisioningState? provisioningState = null)
         {
             attributes ??= new Dictionary<string, BinaryData>();
 
-            return new DeviceRegistryNamespaceDeviceProperties(
+            return new NamespaceDeviceProperties(
                 uuid,
                 enabled,
                 externalDeviceId,
@@ -594,7 +594,7 @@ public static DeviceRegistryNamespaceDeviceProperties DeviceRegistryNamespaceDev
         /// <param name="config"> Defines the device status config properties. </param>
         /// <param name="endpointsInbound"> Defines the device status for inbound/outbound endpoints. </param>
         /// <returns> A new <see cref="Models.DeviceStatus"/> instance for mocking. </returns>
-        public static DeviceStatus DeviceStatus(DeviceRegistryStatusConfig config = null, IReadOnlyDictionary<string, DeviceStatusEndpoint> endpointsInbound = null)
+        public static DeviceStatus DeviceStatus(StatusConfig config = null, IReadOnlyDictionary<string, DeviceStatusEndpoint> endpointsInbound = null)
         {
             endpointsInbound ??= new Dictionary<string, DeviceStatusEndpoint>();
 
@@ -604,12 +604,12 @@ public static DeviceStatus DeviceStatus(DeviceRegistryStatusConfig config = null
         /// <summary> Initializes a new instance of <see cref="Models.DeviceStatusEndpoint"/>. </summary>
         /// <param name="error"> Defines the error related to this endpoint. </param>
         /// <returns> A new <see cref="Models.DeviceStatusEndpoint"/> instance for mocking. </returns>
-        public static DeviceStatusEndpoint DeviceStatusEndpoint(DeviceRegistryStatusError error = null)
+        public static DeviceStatusEndpoint DeviceStatusEndpoint(StatusError error = null)
         {
             return new DeviceStatusEndpoint(error, serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistry.DeviceRegistryNamespaceDiscoveredAssetData"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="DeviceRegistry.NamespaceDiscoveredAssetData"/>. </summary>
         /// <param name="id"> The id. </param>
         /// <param name="name"> The name. </param>
         /// <param name="resourceType"> The resourceType. </param>
@@ -618,12 +618,12 @@ public static DeviceStatusEndpoint DeviceStatusEndpoint(DeviceRegistryStatusErro
         /// <param name="location"> The location. </param>
         /// <param name="properties"> The resource-specific properties for this resource. </param>
         /// <param name="extendedLocation"> The extended location. </param>
-        /// <returns> A new <see cref="DeviceRegistry.DeviceRegistryNamespaceDiscoveredAssetData"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceDiscoveredAssetData DeviceRegistryNamespaceDiscoveredAssetData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IDictionary<string, string> tags = null, AzureLocation location = default, DeviceRegistryNamespaceDiscoveredAssetProperties properties = null, DeviceRegistryExtendedLocation extendedLocation = null)
+        /// <returns> A new <see cref="DeviceRegistry.NamespaceDiscoveredAssetData"/> instance for mocking. </returns>
+        public static NamespaceDiscoveredAssetData NamespaceDiscoveredAssetData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IDictionary<string, string> tags = null, AzureLocation location = default, NamespaceDiscoveredAssetProperties properties = null, DeviceRegistryExtendedLocation extendedLocation = null)
         {
             tags ??= new Dictionary<string, string>();
 
-            return new DeviceRegistryNamespaceDiscoveredAssetData(
+            return new NamespaceDiscoveredAssetData(
                 id,
                 name,
                 resourceType,
@@ -635,7 +635,7 @@ public static DeviceRegistryNamespaceDiscoveredAssetData DeviceRegistryNamespace
                 serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryNamespaceDiscoveredAssetProperties"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.NamespaceDiscoveredAssetProperties"/>. </summary>
         /// <param name="deviceRef"> Reference to the device that provides data for this asset. Must provide device name &amp; endpoint on the device to use. </param>
         /// <param name="displayName"> Human-readable display name. </param>
         /// <param name="assetTypeRefs"> URIs or type definition IDs. </param>
@@ -676,8 +676,8 @@ public static DeviceRegistryNamespaceDiscoveredAssetData DeviceRegistryNamespace
         /// <param name="streams"> Array of streams that are part of the asset. Each stream can have a per-stream configuration. </param>
         /// <param name="managementGroups"> Array of management groups that are part of the asset. Each management group can have a per-group configuration. </param>
         /// <param name="provisioningState"> Provisioning state of the resource. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryNamespaceDiscoveredAssetProperties"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceDiscoveredAssetProperties DeviceRegistryNamespaceDiscoveredAssetProperties(DeviceRef deviceRef = null, string displayName = null, IEnumerable<string> assetTypeRefs = null, string description = null, string discoveryId = null, string externalAssetId = null, long version = default, string manufacturer = null, string manufacturerUri = null, string model = null, string productCode = null, string hardwareRevision = null, string softwareRevision = null, string documentationUri = null, string serialNumber = null, IDictionary<string, BinaryData> attributes = null, string defaultDatasetsConfiguration = null, string defaultEventsConfiguration = null, string defaultStreamsConfiguration = null, string defaultManagementGroupsConfiguration = null, IEnumerable<DatasetDestination> defaultDatasetsDestinations = null, IEnumerable<EventDestination> defaultEventsDestinations = null, IEnumerable<StreamDestination> defaultStreamsDestinations = null, IEnumerable<NamespaceDiscoveredDataset> datasets = null, IEnumerable<NamespaceDiscoveredEventGroup> eventGroups = null, IEnumerable<NamespaceDiscoveredStream> streams = null, IEnumerable<NamespaceDiscoveredManagementGroup> managementGroups = null, DeviceRegistryProvisioningState? provisioningState = null)
+        /// <returns> A new <see cref="Models.NamespaceDiscoveredAssetProperties"/> instance for mocking. </returns>
+        public static NamespaceDiscoveredAssetProperties NamespaceDiscoveredAssetProperties(DeviceRef deviceRef = null, string displayName = null, IEnumerable<string> assetTypeRefs = null, string description = null, string discoveryId = null, string externalAssetId = null, long version = default, string manufacturer = null, string manufacturerUri = null, string model = null, string productCode = null, string hardwareRevision = null, string softwareRevision = null, string documentationUri = null, string serialNumber = null, IDictionary<string, BinaryData> attributes = null, string defaultDatasetsConfiguration = null, string defaultEventsConfiguration = null, string defaultStreamsConfiguration = null, string defaultManagementGroupsConfiguration = null, IEnumerable<DatasetDestination> defaultDatasetsDestinations = null, IEnumerable<EventDestination> defaultEventsDestinations = null, IEnumerable<StreamDestination> defaultStreamsDestinations = null, IEnumerable<NamespaceDiscoveredDataset> datasets = null, IEnumerable<NamespaceDiscoveredEventGroup> eventGroups = null, IEnumerable<NamespaceDiscoveredStream> streams = null, IEnumerable<NamespaceDiscoveredManagementGroup> managementGroups = null, DeviceRegistryProvisioningState? provisioningState = null)
         {
             assetTypeRefs ??= new List<string>();
             attributes ??= new Dictionary<string, BinaryData>();
@@ -689,7 +689,7 @@ public static DeviceRegistryNamespaceDiscoveredAssetProperties DeviceRegistryNam
             streams ??= new List<NamespaceDiscoveredStream>();
             managementGroups ??= new List<NamespaceDiscoveredManagementGroup>();
 
-            return new DeviceRegistryNamespaceDiscoveredAssetProperties(
+            return new NamespaceDiscoveredAssetProperties(
                 deviceRef,
                 displayName,
                 assetTypeRefs?.ToList(),
@@ -721,7 +721,7 @@ public static DeviceRegistryNamespaceDiscoveredAssetProperties DeviceRegistryNam
                 serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistry.DeviceRegistryNamespaceDiscoveredDeviceData"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="DeviceRegistry.NamespaceDiscoveredDeviceData"/>. </summary>
         /// <param name="id"> The id. </param>
         /// <param name="name"> The name. </param>
         /// <param name="resourceType"> The resourceType. </param>
@@ -730,12 +730,12 @@ public static DeviceRegistryNamespaceDiscoveredAssetProperties DeviceRegistryNam
         /// <param name="location"> The location. </param>
         /// <param name="properties"> The resource-specific properties for this resource. </param>
         /// <param name="extendedLocation"> The extended location. </param>
-        /// <returns> A new <see cref="DeviceRegistry.DeviceRegistryNamespaceDiscoveredDeviceData"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceDiscoveredDeviceData DeviceRegistryNamespaceDiscoveredDeviceData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IDictionary<string, string> tags = null, AzureLocation location = default, DeviceRegistryNamespaceDiscoveredDeviceProperties properties = null, DeviceRegistryExtendedLocation extendedLocation = null)
+        /// <returns> A new <see cref="DeviceRegistry.NamespaceDiscoveredDeviceData"/> instance for mocking. </returns>
+        public static NamespaceDiscoveredDeviceData NamespaceDiscoveredDeviceData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IDictionary<string, string> tags = null, AzureLocation location = default, NamespaceDiscoveredDeviceProperties properties = null, DeviceRegistryExtendedLocation extendedLocation = null)
         {
             tags ??= new Dictionary<string, string>();
 
-            return new DeviceRegistryNamespaceDiscoveredDeviceData(
+            return new NamespaceDiscoveredDeviceData(
                 id,
                 name,
                 resourceType,
@@ -747,7 +747,7 @@ public static DeviceRegistryNamespaceDiscoveredDeviceData DeviceRegistryNamespac
                 serializedAdditionalRawData: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DeviceRegistryNamespaceDiscoveredDeviceProperties"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="Models.NamespaceDiscoveredDeviceProperties"/>. </summary>
         /// <param name="externalDeviceId"> A device ID that represents the device in a system external to Azure. Unique within scope of an Azure tenant. </param>
         /// <param name="endpoints"> Endpoints for discovered devices. </param>
         /// <param name="manufacturer"> Device manufacturer. </param>
@@ -758,12 +758,12 @@ public static DeviceRegistryNamespaceDiscoveredDeviceData DeviceRegistryNamespac
         /// <param name="discoveryId"> Identifier used to detect changes in the discovered device. </param>
         /// <param name="version"> An integer that is incremented each time the resource is modified. </param>
         /// <param name="provisioningState"> Provisioning state of the resource. </param>
-        /// <returns> A new <see cref="Models.DeviceRegistryNamespaceDiscoveredDeviceProperties"/> instance for mocking. </returns>
-        public static DeviceRegistryNamespaceDiscoveredDeviceProperties DeviceRegistryNamespaceDiscoveredDeviceProperties(string externalDeviceId = null, DiscoveredMessagingEndpoints endpoints = null, string manufacturer = null, string model = null, string operatingSystem = null, string operatingSystemVersion = null, IDictionary<string, BinaryData> attributes = null, string discoveryId = null, long version = default, DeviceRegistryProvisioningState? provisioningState = null)
+        /// <returns> A new <see cref="Models.NamespaceDiscoveredDeviceProperties"/> instance for mocking. </returns>
+        public static NamespaceDiscoveredDeviceProperties NamespaceDiscoveredDeviceProperties(string externalDeviceId = null, DiscoveredMessagingEndpoints endpoints = null, string manufacturer = null, string model = null, string operatingSystem = null, string operatingSystemVersion = null, IDictionary<string, BinaryData> attributes = null, string discoveryId = null, long version = default, DeviceRegistryProvisioningState? provisioningState = null)
         {
             attributes ??= new Dictionary<string, BinaryData>();
 
-            return new DeviceRegistryNamespaceDiscoveredDeviceProperties(
+            return new NamespaceDiscoveredDeviceProperties(
                 externalDeviceId,
                 endpoints,
                 manufacturer,
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceAssetResource.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceAssetResource.Serialization.cs
deleted file mode 100644
index f157cae33249..000000000000
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceAssetResource.Serialization.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Text.Json;
-
-namespace Azure.ResourceManager.DeviceRegistry
-{
-    public partial class DeviceRegistryNamespaceAssetResource : IJsonModel<DeviceRegistryNamespaceAssetData>
-    {
-        private static DeviceRegistryNamespaceAssetData s_dataDeserializationInstance;
-        private static DeviceRegistryNamespaceAssetData DataDeserializationInstance => s_dataDeserializationInstance ??= new();
-
-        void IJsonModel<DeviceRegistryNamespaceAssetData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<DeviceRegistryNamespaceAssetData>)Data).Write(writer, options);
-
-        DeviceRegistryNamespaceAssetData IJsonModel<DeviceRegistryNamespaceAssetData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => ((IJsonModel<DeviceRegistryNamespaceAssetData>)DataDeserializationInstance).Create(ref reader, options);
-
-        BinaryData IPersistableModel<DeviceRegistryNamespaceAssetData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<DeviceRegistryNamespaceAssetData>(Data, options, AzureResourceManagerDeviceRegistryContext.Default);
-
-        DeviceRegistryNamespaceAssetData IPersistableModel<DeviceRegistryNamespaceAssetData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<DeviceRegistryNamespaceAssetData>(data, options, AzureResourceManagerDeviceRegistryContext.Default);
-
-        string IPersistableModel<DeviceRegistryNamespaceAssetData>.GetFormatFromOptions(ModelReaderWriterOptions options) => ((IPersistableModel<DeviceRegistryNamespaceAssetData>)DataDeserializationInstance).GetFormatFromOptions(options);
-    }
-}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDeviceResource.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDeviceResource.Serialization.cs
deleted file mode 100644
index f89f0fd43c34..000000000000
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDeviceResource.Serialization.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Text.Json;
-
-namespace Azure.ResourceManager.DeviceRegistry
-{
-    public partial class DeviceRegistryNamespaceDeviceResource : IJsonModel<DeviceRegistryNamespaceDeviceData>
-    {
-        private static DeviceRegistryNamespaceDeviceData s_dataDeserializationInstance;
-        private static DeviceRegistryNamespaceDeviceData DataDeserializationInstance => s_dataDeserializationInstance ??= new();
-
-        void IJsonModel<DeviceRegistryNamespaceDeviceData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<DeviceRegistryNamespaceDeviceData>)Data).Write(writer, options);
-
-        DeviceRegistryNamespaceDeviceData IJsonModel<DeviceRegistryNamespaceDeviceData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => ((IJsonModel<DeviceRegistryNamespaceDeviceData>)DataDeserializationInstance).Create(ref reader, options);
-
-        BinaryData IPersistableModel<DeviceRegistryNamespaceDeviceData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<DeviceRegistryNamespaceDeviceData>(Data, options, AzureResourceManagerDeviceRegistryContext.Default);
-
-        DeviceRegistryNamespaceDeviceData IPersistableModel<DeviceRegistryNamespaceDeviceData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<DeviceRegistryNamespaceDeviceData>(data, options, AzureResourceManagerDeviceRegistryContext.Default);
-
-        string IPersistableModel<DeviceRegistryNamespaceDeviceData>.GetFormatFromOptions(ModelReaderWriterOptions options) => ((IPersistableModel<DeviceRegistryNamespaceDeviceData>)DataDeserializationInstance).GetFormatFromOptions(options);
-    }
-}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredAssetResource.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredAssetResource.Serialization.cs
deleted file mode 100644
index 78c4b8ebe6c1..000000000000
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredAssetResource.Serialization.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Text.Json;
-
-namespace Azure.ResourceManager.DeviceRegistry
-{
-    public partial class DeviceRegistryNamespaceDiscoveredAssetResource : IJsonModel<DeviceRegistryNamespaceDiscoveredAssetData>
-    {
-        private static DeviceRegistryNamespaceDiscoveredAssetData s_dataDeserializationInstance;
-        private static DeviceRegistryNamespaceDiscoveredAssetData DataDeserializationInstance => s_dataDeserializationInstance ??= new();
-
-        void IJsonModel<DeviceRegistryNamespaceDiscoveredAssetData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<DeviceRegistryNamespaceDiscoveredAssetData>)Data).Write(writer, options);
-
-        DeviceRegistryNamespaceDiscoveredAssetData IJsonModel<DeviceRegistryNamespaceDiscoveredAssetData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => ((IJsonModel<DeviceRegistryNamespaceDiscoveredAssetData>)DataDeserializationInstance).Create(ref reader, options);
-
-        BinaryData IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<DeviceRegistryNamespaceDiscoveredAssetData>(Data, options, AzureResourceManagerDeviceRegistryContext.Default);
-
-        DeviceRegistryNamespaceDiscoveredAssetData IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<DeviceRegistryNamespaceDiscoveredAssetData>(data, options, AzureResourceManagerDeviceRegistryContext.Default);
-
-        string IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetData>.GetFormatFromOptions(ModelReaderWriterOptions options) => ((IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetData>)DataDeserializationInstance).GetFormatFromOptions(options);
-    }
-}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredDeviceResource.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredDeviceResource.Serialization.cs
deleted file mode 100644
index 44be24267918..000000000000
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredDeviceResource.Serialization.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Text.Json;
-
-namespace Azure.ResourceManager.DeviceRegistry
-{
-    public partial class DeviceRegistryNamespaceDiscoveredDeviceResource : IJsonModel<DeviceRegistryNamespaceDiscoveredDeviceData>
-    {
-        private static DeviceRegistryNamespaceDiscoveredDeviceData s_dataDeserializationInstance;
-        private static DeviceRegistryNamespaceDiscoveredDeviceData DataDeserializationInstance => s_dataDeserializationInstance ??= new();
-
-        void IJsonModel<DeviceRegistryNamespaceDiscoveredDeviceData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<DeviceRegistryNamespaceDiscoveredDeviceData>)Data).Write(writer, options);
-
-        DeviceRegistryNamespaceDiscoveredDeviceData IJsonModel<DeviceRegistryNamespaceDiscoveredDeviceData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => ((IJsonModel<DeviceRegistryNamespaceDiscoveredDeviceData>)DataDeserializationInstance).Create(ref reader, options);
-
-        BinaryData IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<DeviceRegistryNamespaceDiscoveredDeviceData>(Data, options, AzureResourceManagerDeviceRegistryContext.Default);
-
-        DeviceRegistryNamespaceDiscoveredDeviceData IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<DeviceRegistryNamespaceDiscoveredDeviceData>(data, options, AzureResourceManagerDeviceRegistryContext.Default);
-
-        string IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceData>.GetFormatFromOptions(ModelReaderWriterOptions options) => ((IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceData>)DataDeserializationInstance).GetFormatFromOptions(options);
-    }
-}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceResource.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceResource.Serialization.cs
deleted file mode 100644
index 03c5c61426cb..000000000000
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceResource.Serialization.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Text.Json;
-
-namespace Azure.ResourceManager.DeviceRegistry
-{
-    public partial class DeviceRegistryNamespaceResource : IJsonModel<DeviceRegistryNamespaceData>
-    {
-        private static DeviceRegistryNamespaceData s_dataDeserializationInstance;
-        private static DeviceRegistryNamespaceData DataDeserializationInstance => s_dataDeserializationInstance ??= new();
-
-        void IJsonModel<DeviceRegistryNamespaceData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<DeviceRegistryNamespaceData>)Data).Write(writer, options);
-
-        DeviceRegistryNamespaceData IJsonModel<DeviceRegistryNamespaceData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => ((IJsonModel<DeviceRegistryNamespaceData>)DataDeserializationInstance).Create(ref reader, options);
-
-        BinaryData IPersistableModel<DeviceRegistryNamespaceData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<DeviceRegistryNamespaceData>(Data, options, AzureResourceManagerDeviceRegistryContext.Default);
-
-        DeviceRegistryNamespaceData IPersistableModel<DeviceRegistryNamespaceData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<DeviceRegistryNamespaceData>(data, options, AzureResourceManagerDeviceRegistryContext.Default);
-
-        string IPersistableModel<DeviceRegistryNamespaceData>.GetFormatFromOptions(ModelReaderWriterOptions options) => ((IPersistableModel<DeviceRegistryNamespaceData>)DataDeserializationInstance).GetFormatFromOptions(options);
-    }
-}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/DeviceRegistryExtensions.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/DeviceRegistryExtensions.cs
index 181b0c91a73c..c1a93dfd2bfb 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/DeviceRegistryExtensions.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/DeviceRegistryExtensions.cs
@@ -90,98 +90,98 @@ public static DeviceRegistryBillingContainerResource GetDeviceRegistryBillingCon
         }
 
         /// <summary>
-        /// Gets an object representing a <see cref="DeviceRegistryNamespaceResource" /> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="DeviceRegistryNamespaceResource.CreateResourceIdentifier" /> to create a <see cref="DeviceRegistryNamespaceResource" /> <see cref="ResourceIdentifier" /> from its components.
+        /// Gets an object representing a <see cref="NamespaceResource" /> along with the instance operations that can be performed on it but with no data.
+        /// You can use <see cref="NamespaceResource.CreateResourceIdentifier" /> to create a <see cref="NamespaceResource" /> <see cref="ResourceIdentifier" /> from its components.
         /// <item>
         /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryArmClient.GetDeviceRegistryNamespaceResource(ResourceIdentifier)"/> instead.</description>
+        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryArmClient.GetNamespaceResource(ResourceIdentifier)"/> instead.</description>
         /// </item>
         /// </summary>
         /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
         /// <param name="id"> The resource ID of the resource to get. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
-        /// <returns> Returns a <see cref="DeviceRegistryNamespaceResource"/> object. </returns>
-        public static DeviceRegistryNamespaceResource GetDeviceRegistryNamespaceResource(this ArmClient client, ResourceIdentifier id)
+        /// <returns> Returns a <see cref="NamespaceResource"/> object. </returns>
+        public static NamespaceResource GetNamespaceResource(this ArmClient client, ResourceIdentifier id)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableDeviceRegistryArmClient(client).GetDeviceRegistryNamespaceResource(id);
+            return GetMockableDeviceRegistryArmClient(client).GetNamespaceResource(id);
         }
 
         /// <summary>
-        /// Gets an object representing a <see cref="DeviceRegistryNamespaceAssetResource" /> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="DeviceRegistryNamespaceAssetResource.CreateResourceIdentifier" /> to create a <see cref="DeviceRegistryNamespaceAssetResource" /> <see cref="ResourceIdentifier" /> from its components.
+        /// Gets an object representing a <see cref="NamespaceAssetResource" /> along with the instance operations that can be performed on it but with no data.
+        /// You can use <see cref="NamespaceAssetResource.CreateResourceIdentifier" /> to create a <see cref="NamespaceAssetResource" /> <see cref="ResourceIdentifier" /> from its components.
         /// <item>
         /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryArmClient.GetDeviceRegistryNamespaceAssetResource(ResourceIdentifier)"/> instead.</description>
+        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryArmClient.GetNamespaceAssetResource(ResourceIdentifier)"/> instead.</description>
         /// </item>
         /// </summary>
         /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
         /// <param name="id"> The resource ID of the resource to get. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
-        /// <returns> Returns a <see cref="DeviceRegistryNamespaceAssetResource"/> object. </returns>
-        public static DeviceRegistryNamespaceAssetResource GetDeviceRegistryNamespaceAssetResource(this ArmClient client, ResourceIdentifier id)
+        /// <returns> Returns a <see cref="NamespaceAssetResource"/> object. </returns>
+        public static NamespaceAssetResource GetNamespaceAssetResource(this ArmClient client, ResourceIdentifier id)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableDeviceRegistryArmClient(client).GetDeviceRegistryNamespaceAssetResource(id);
+            return GetMockableDeviceRegistryArmClient(client).GetNamespaceAssetResource(id);
         }
 
         /// <summary>
-        /// Gets an object representing a <see cref="DeviceRegistryNamespaceDeviceResource" /> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="DeviceRegistryNamespaceDeviceResource.CreateResourceIdentifier" /> to create a <see cref="DeviceRegistryNamespaceDeviceResource" /> <see cref="ResourceIdentifier" /> from its components.
+        /// Gets an object representing a <see cref="NamespaceDeviceResource" /> along with the instance operations that can be performed on it but with no data.
+        /// You can use <see cref="NamespaceDeviceResource.CreateResourceIdentifier" /> to create a <see cref="NamespaceDeviceResource" /> <see cref="ResourceIdentifier" /> from its components.
         /// <item>
         /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryArmClient.GetDeviceRegistryNamespaceDeviceResource(ResourceIdentifier)"/> instead.</description>
+        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryArmClient.GetNamespaceDeviceResource(ResourceIdentifier)"/> instead.</description>
         /// </item>
         /// </summary>
         /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
         /// <param name="id"> The resource ID of the resource to get. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
-        /// <returns> Returns a <see cref="DeviceRegistryNamespaceDeviceResource"/> object. </returns>
-        public static DeviceRegistryNamespaceDeviceResource GetDeviceRegistryNamespaceDeviceResource(this ArmClient client, ResourceIdentifier id)
+        /// <returns> Returns a <see cref="NamespaceDeviceResource"/> object. </returns>
+        public static NamespaceDeviceResource GetNamespaceDeviceResource(this ArmClient client, ResourceIdentifier id)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableDeviceRegistryArmClient(client).GetDeviceRegistryNamespaceDeviceResource(id);
+            return GetMockableDeviceRegistryArmClient(client).GetNamespaceDeviceResource(id);
         }
 
         /// <summary>
-        /// Gets an object representing a <see cref="DeviceRegistryNamespaceDiscoveredAssetResource" /> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="DeviceRegistryNamespaceDiscoveredAssetResource.CreateResourceIdentifier" /> to create a <see cref="DeviceRegistryNamespaceDiscoveredAssetResource" /> <see cref="ResourceIdentifier" /> from its components.
+        /// Gets an object representing a <see cref="NamespaceDiscoveredAssetResource" /> along with the instance operations that can be performed on it but with no data.
+        /// You can use <see cref="NamespaceDiscoveredAssetResource.CreateResourceIdentifier" /> to create a <see cref="NamespaceDiscoveredAssetResource" /> <see cref="ResourceIdentifier" /> from its components.
         /// <item>
         /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryArmClient.GetDeviceRegistryNamespaceDiscoveredAssetResource(ResourceIdentifier)"/> instead.</description>
+        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryArmClient.GetNamespaceDiscoveredAssetResource(ResourceIdentifier)"/> instead.</description>
         /// </item>
         /// </summary>
         /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
         /// <param name="id"> The resource ID of the resource to get. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
-        /// <returns> Returns a <see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/> object. </returns>
-        public static DeviceRegistryNamespaceDiscoveredAssetResource GetDeviceRegistryNamespaceDiscoveredAssetResource(this ArmClient client, ResourceIdentifier id)
+        /// <returns> Returns a <see cref="NamespaceDiscoveredAssetResource"/> object. </returns>
+        public static NamespaceDiscoveredAssetResource GetNamespaceDiscoveredAssetResource(this ArmClient client, ResourceIdentifier id)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableDeviceRegistryArmClient(client).GetDeviceRegistryNamespaceDiscoveredAssetResource(id);
+            return GetMockableDeviceRegistryArmClient(client).GetNamespaceDiscoveredAssetResource(id);
         }
 
         /// <summary>
-        /// Gets an object representing a <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource" /> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource.CreateResourceIdentifier" /> to create a <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource" /> <see cref="ResourceIdentifier" /> from its components.
+        /// Gets an object representing a <see cref="NamespaceDiscoveredDeviceResource" /> along with the instance operations that can be performed on it but with no data.
+        /// You can use <see cref="NamespaceDiscoveredDeviceResource.CreateResourceIdentifier" /> to create a <see cref="NamespaceDiscoveredDeviceResource" /> <see cref="ResourceIdentifier" /> from its components.
         /// <item>
         /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryArmClient.GetDeviceRegistryNamespaceDiscoveredDeviceResource(ResourceIdentifier)"/> instead.</description>
+        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryArmClient.GetNamespaceDiscoveredDeviceResource(ResourceIdentifier)"/> instead.</description>
         /// </item>
         /// </summary>
         /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
         /// <param name="id"> The resource ID of the resource to get. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
-        /// <returns> Returns a <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/> object. </returns>
-        public static DeviceRegistryNamespaceDiscoveredDeviceResource GetDeviceRegistryNamespaceDiscoveredDeviceResource(this ArmClient client, ResourceIdentifier id)
+        /// <returns> Returns a <see cref="NamespaceDiscoveredDeviceResource"/> object. </returns>
+        public static NamespaceDiscoveredDeviceResource GetNamespaceDiscoveredDeviceResource(this ArmClient client, ResourceIdentifier id)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableDeviceRegistryArmClient(client).GetDeviceRegistryNamespaceDiscoveredDeviceResource(id);
+            return GetMockableDeviceRegistryArmClient(client).GetNamespaceDiscoveredDeviceResource(id);
         }
 
         /// <summary>
@@ -428,20 +428,20 @@ public static Response<DeviceRegistryAssetEndpointProfileResource> GetDeviceRegi
         }
 
         /// <summary>
-        /// Gets a collection of DeviceRegistryNamespaceResources in the ResourceGroupResource.
+        /// Gets a collection of NamespaceResources in the ResourceGroupResource.
         /// <item>
         /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryResourceGroupResource.GetDeviceRegistryNamespaces()"/> instead.</description>
+        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryResourceGroupResource.GetNamespaces()"/> instead.</description>
         /// </item>
         /// </summary>
         /// <param name="resourceGroupResource"> The <see cref="ResourceGroupResource" /> instance the method will execute against. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupResource"/> is null. </exception>
-        /// <returns> An object representing collection of DeviceRegistryNamespaceResources and their operations over a DeviceRegistryNamespaceResource. </returns>
-        public static DeviceRegistryNamespaceCollection GetDeviceRegistryNamespaces(this ResourceGroupResource resourceGroupResource)
+        /// <returns> An object representing collection of NamespaceResources and their operations over a NamespaceResource. </returns>
+        public static NamespaceCollection GetNamespaces(this ResourceGroupResource resourceGroupResource)
         {
             Argument.AssertNotNull(resourceGroupResource, nameof(resourceGroupResource));
 
-            return GetMockableDeviceRegistryResourceGroupResource(resourceGroupResource).GetDeviceRegistryNamespaces();
+            return GetMockableDeviceRegistryResourceGroupResource(resourceGroupResource).GetNamespaces();
         }
 
         /// <summary>
@@ -461,12 +461,12 @@ public static DeviceRegistryNamespaceCollection GetDeviceRegistryNamespaces(this
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// <item>
         /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryResourceGroupResource.GetDeviceRegistryNamespaceAsync(string,CancellationToken)"/> instead.</description>
+        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryResourceGroupResource.GetNamespaceAsync(string,CancellationToken)"/> instead.</description>
         /// </item>
         /// </summary>
         /// <param name="resourceGroupResource"> The <see cref="ResourceGroupResource" /> instance the method will execute against. </param>
@@ -475,11 +475,11 @@ public static DeviceRegistryNamespaceCollection GetDeviceRegistryNamespaces(this
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupResource"/> or <paramref name="namespaceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public static async Task<Response<DeviceRegistryNamespaceResource>> GetDeviceRegistryNamespaceAsync(this ResourceGroupResource resourceGroupResource, string namespaceName, CancellationToken cancellationToken = default)
+        public static async Task<Response<NamespaceResource>> GetNamespaceAsync(this ResourceGroupResource resourceGroupResource, string namespaceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(resourceGroupResource, nameof(resourceGroupResource));
 
-            return await GetMockableDeviceRegistryResourceGroupResource(resourceGroupResource).GetDeviceRegistryNamespaceAsync(namespaceName, cancellationToken).ConfigureAwait(false);
+            return await GetMockableDeviceRegistryResourceGroupResource(resourceGroupResource).GetNamespaceAsync(namespaceName, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -499,12 +499,12 @@ public static async Task<Response<DeviceRegistryNamespaceResource>> GetDeviceReg
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// <item>
         /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryResourceGroupResource.GetDeviceRegistryNamespace(string,CancellationToken)"/> instead.</description>
+        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistryResourceGroupResource.GetNamespace(string,CancellationToken)"/> instead.</description>
         /// </item>
         /// </summary>
         /// <param name="resourceGroupResource"> The <see cref="ResourceGroupResource" /> instance the method will execute against. </param>
@@ -513,11 +513,11 @@ public static async Task<Response<DeviceRegistryNamespaceResource>> GetDeviceReg
         /// <exception cref="ArgumentNullException"> <paramref name="resourceGroupResource"/> or <paramref name="namespaceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public static Response<DeviceRegistryNamespaceResource> GetDeviceRegistryNamespace(this ResourceGroupResource resourceGroupResource, string namespaceName, CancellationToken cancellationToken = default)
+        public static Response<NamespaceResource> GetNamespace(this ResourceGroupResource resourceGroupResource, string namespaceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(resourceGroupResource, nameof(resourceGroupResource));
 
-            return GetMockableDeviceRegistryResourceGroupResource(resourceGroupResource).GetDeviceRegistryNamespace(namespaceName, cancellationToken);
+            return GetMockableDeviceRegistryResourceGroupResource(resourceGroupResource).GetNamespace(namespaceName, cancellationToken);
         }
 
         /// <summary>
@@ -867,23 +867,23 @@ public static Pageable<DeviceRegistryAssetEndpointProfileResource> GetDeviceRegi
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// <item>
         /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistrySubscriptionResource.GetDeviceRegistryNamespaces(CancellationToken)"/> instead.</description>
+        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistrySubscriptionResource.GetNamespaces(CancellationToken)"/> instead.</description>
         /// </item>
         /// </summary>
         /// <param name="subscriptionResource"> The <see cref="SubscriptionResource" /> instance the method will execute against. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionResource"/> is null. </exception>
-        /// <returns> An async collection of <see cref="DeviceRegistryNamespaceResource"/> that may take multiple service requests to iterate over. </returns>
-        public static AsyncPageable<DeviceRegistryNamespaceResource> GetDeviceRegistryNamespacesAsync(this SubscriptionResource subscriptionResource, CancellationToken cancellationToken = default)
+        /// <returns> An async collection of <see cref="NamespaceResource"/> that may take multiple service requests to iterate over. </returns>
+        public static AsyncPageable<NamespaceResource> GetNamespacesAsync(this SubscriptionResource subscriptionResource, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(subscriptionResource, nameof(subscriptionResource));
 
-            return GetMockableDeviceRegistrySubscriptionResource(subscriptionResource).GetDeviceRegistryNamespacesAsync(cancellationToken);
+            return GetMockableDeviceRegistrySubscriptionResource(subscriptionResource).GetNamespacesAsync(cancellationToken);
         }
 
         /// <summary>
@@ -903,23 +903,23 @@ public static AsyncPageable<DeviceRegistryNamespaceResource> GetDeviceRegistryNa
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// <item>
         /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistrySubscriptionResource.GetDeviceRegistryNamespaces(CancellationToken)"/> instead.</description>
+        /// <description>To mock this method, please mock <see cref="MockableDeviceRegistrySubscriptionResource.GetNamespaces(CancellationToken)"/> instead.</description>
         /// </item>
         /// </summary>
         /// <param name="subscriptionResource"> The <see cref="SubscriptionResource" /> instance the method will execute against. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionResource"/> is null. </exception>
-        /// <returns> A collection of <see cref="DeviceRegistryNamespaceResource"/> that may take multiple service requests to iterate over. </returns>
-        public static Pageable<DeviceRegistryNamespaceResource> GetDeviceRegistryNamespaces(this SubscriptionResource subscriptionResource, CancellationToken cancellationToken = default)
+        /// <returns> A collection of <see cref="NamespaceResource"/> that may take multiple service requests to iterate over. </returns>
+        public static Pageable<NamespaceResource> GetNamespaces(this SubscriptionResource subscriptionResource, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(subscriptionResource, nameof(subscriptionResource));
 
-            return GetMockableDeviceRegistrySubscriptionResource(subscriptionResource).GetDeviceRegistryNamespaces(cancellationToken);
+            return GetMockableDeviceRegistrySubscriptionResource(subscriptionResource).GetNamespaces(cancellationToken);
         }
 
         /// <summary>
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/MockableDeviceRegistryArmClient.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/MockableDeviceRegistryArmClient.cs
index 052d4134dbff..f40380dfa187 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/MockableDeviceRegistryArmClient.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/MockableDeviceRegistryArmClient.cs
@@ -71,63 +71,63 @@ public virtual DeviceRegistryBillingContainerResource GetDeviceRegistryBillingCo
         }
 
         /// <summary>
-        /// Gets an object representing a <see cref="DeviceRegistryNamespaceResource"/> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="DeviceRegistryNamespaceResource.CreateResourceIdentifier" /> to create a <see cref="DeviceRegistryNamespaceResource"/> <see cref="ResourceIdentifier"/> from its components.
+        /// Gets an object representing a <see cref="NamespaceResource"/> along with the instance operations that can be performed on it but with no data.
+        /// You can use <see cref="NamespaceResource.CreateResourceIdentifier" /> to create a <see cref="NamespaceResource"/> <see cref="ResourceIdentifier"/> from its components.
         /// </summary>
         /// <param name="id"> The resource ID of the resource to get. </param>
-        /// <returns> Returns a <see cref="DeviceRegistryNamespaceResource"/> object. </returns>
-        public virtual DeviceRegistryNamespaceResource GetDeviceRegistryNamespaceResource(ResourceIdentifier id)
+        /// <returns> Returns a <see cref="NamespaceResource"/> object. </returns>
+        public virtual NamespaceResource GetNamespaceResource(ResourceIdentifier id)
         {
-            DeviceRegistryNamespaceResource.ValidateResourceId(id);
-            return new DeviceRegistryNamespaceResource(Client, id);
+            NamespaceResource.ValidateResourceId(id);
+            return new NamespaceResource(Client, id);
         }
 
         /// <summary>
-        /// Gets an object representing a <see cref="DeviceRegistryNamespaceAssetResource"/> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="DeviceRegistryNamespaceAssetResource.CreateResourceIdentifier" /> to create a <see cref="DeviceRegistryNamespaceAssetResource"/> <see cref="ResourceIdentifier"/> from its components.
+        /// Gets an object representing a <see cref="NamespaceAssetResource"/> along with the instance operations that can be performed on it but with no data.
+        /// You can use <see cref="NamespaceAssetResource.CreateResourceIdentifier" /> to create a <see cref="NamespaceAssetResource"/> <see cref="ResourceIdentifier"/> from its components.
         /// </summary>
         /// <param name="id"> The resource ID of the resource to get. </param>
-        /// <returns> Returns a <see cref="DeviceRegistryNamespaceAssetResource"/> object. </returns>
-        public virtual DeviceRegistryNamespaceAssetResource GetDeviceRegistryNamespaceAssetResource(ResourceIdentifier id)
+        /// <returns> Returns a <see cref="NamespaceAssetResource"/> object. </returns>
+        public virtual NamespaceAssetResource GetNamespaceAssetResource(ResourceIdentifier id)
         {
-            DeviceRegistryNamespaceAssetResource.ValidateResourceId(id);
-            return new DeviceRegistryNamespaceAssetResource(Client, id);
+            NamespaceAssetResource.ValidateResourceId(id);
+            return new NamespaceAssetResource(Client, id);
         }
 
         /// <summary>
-        /// Gets an object representing a <see cref="DeviceRegistryNamespaceDeviceResource"/> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="DeviceRegistryNamespaceDeviceResource.CreateResourceIdentifier" /> to create a <see cref="DeviceRegistryNamespaceDeviceResource"/> <see cref="ResourceIdentifier"/> from its components.
+        /// Gets an object representing a <see cref="NamespaceDeviceResource"/> along with the instance operations that can be performed on it but with no data.
+        /// You can use <see cref="NamespaceDeviceResource.CreateResourceIdentifier" /> to create a <see cref="NamespaceDeviceResource"/> <see cref="ResourceIdentifier"/> from its components.
         /// </summary>
         /// <param name="id"> The resource ID of the resource to get. </param>
-        /// <returns> Returns a <see cref="DeviceRegistryNamespaceDeviceResource"/> object. </returns>
-        public virtual DeviceRegistryNamespaceDeviceResource GetDeviceRegistryNamespaceDeviceResource(ResourceIdentifier id)
+        /// <returns> Returns a <see cref="NamespaceDeviceResource"/> object. </returns>
+        public virtual NamespaceDeviceResource GetNamespaceDeviceResource(ResourceIdentifier id)
         {
-            DeviceRegistryNamespaceDeviceResource.ValidateResourceId(id);
-            return new DeviceRegistryNamespaceDeviceResource(Client, id);
+            NamespaceDeviceResource.ValidateResourceId(id);
+            return new NamespaceDeviceResource(Client, id);
         }
 
         /// <summary>
-        /// Gets an object representing a <see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="DeviceRegistryNamespaceDiscoveredAssetResource.CreateResourceIdentifier" /> to create a <see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/> <see cref="ResourceIdentifier"/> from its components.
+        /// Gets an object representing a <see cref="NamespaceDiscoveredAssetResource"/> along with the instance operations that can be performed on it but with no data.
+        /// You can use <see cref="NamespaceDiscoveredAssetResource.CreateResourceIdentifier" /> to create a <see cref="NamespaceDiscoveredAssetResource"/> <see cref="ResourceIdentifier"/> from its components.
         /// </summary>
         /// <param name="id"> The resource ID of the resource to get. </param>
-        /// <returns> Returns a <see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/> object. </returns>
-        public virtual DeviceRegistryNamespaceDiscoveredAssetResource GetDeviceRegistryNamespaceDiscoveredAssetResource(ResourceIdentifier id)
+        /// <returns> Returns a <see cref="NamespaceDiscoveredAssetResource"/> object. </returns>
+        public virtual NamespaceDiscoveredAssetResource GetNamespaceDiscoveredAssetResource(ResourceIdentifier id)
         {
-            DeviceRegistryNamespaceDiscoveredAssetResource.ValidateResourceId(id);
-            return new DeviceRegistryNamespaceDiscoveredAssetResource(Client, id);
+            NamespaceDiscoveredAssetResource.ValidateResourceId(id);
+            return new NamespaceDiscoveredAssetResource(Client, id);
         }
 
         /// <summary>
-        /// Gets an object representing a <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource.CreateResourceIdentifier" /> to create a <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/> <see cref="ResourceIdentifier"/> from its components.
+        /// Gets an object representing a <see cref="NamespaceDiscoveredDeviceResource"/> along with the instance operations that can be performed on it but with no data.
+        /// You can use <see cref="NamespaceDiscoveredDeviceResource.CreateResourceIdentifier" /> to create a <see cref="NamespaceDiscoveredDeviceResource"/> <see cref="ResourceIdentifier"/> from its components.
         /// </summary>
         /// <param name="id"> The resource ID of the resource to get. </param>
-        /// <returns> Returns a <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/> object. </returns>
-        public virtual DeviceRegistryNamespaceDiscoveredDeviceResource GetDeviceRegistryNamespaceDiscoveredDeviceResource(ResourceIdentifier id)
+        /// <returns> Returns a <see cref="NamespaceDiscoveredDeviceResource"/> object. </returns>
+        public virtual NamespaceDiscoveredDeviceResource GetNamespaceDiscoveredDeviceResource(ResourceIdentifier id)
         {
-            DeviceRegistryNamespaceDiscoveredDeviceResource.ValidateResourceId(id);
-            return new DeviceRegistryNamespaceDiscoveredDeviceResource(Client, id);
+            NamespaceDiscoveredDeviceResource.ValidateResourceId(id);
+            return new NamespaceDiscoveredDeviceResource(Client, id);
         }
 
         /// <summary>
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/MockableDeviceRegistryResourceGroupResource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/MockableDeviceRegistryResourceGroupResource.cs
index 4dfe249d8110..fa457c6bc86e 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/MockableDeviceRegistryResourceGroupResource.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/MockableDeviceRegistryResourceGroupResource.cs
@@ -171,11 +171,11 @@ public virtual Response<DeviceRegistryAssetEndpointProfileResource> GetDeviceReg
             return GetDeviceRegistryAssetEndpointProfiles().Get(assetEndpointProfileName, cancellationToken);
         }
 
-        /// <summary> Gets a collection of DeviceRegistryNamespaceResources in the ResourceGroupResource. </summary>
-        /// <returns> An object representing collection of DeviceRegistryNamespaceResources and their operations over a DeviceRegistryNamespaceResource. </returns>
-        public virtual DeviceRegistryNamespaceCollection GetDeviceRegistryNamespaces()
+        /// <summary> Gets a collection of NamespaceResources in the ResourceGroupResource. </summary>
+        /// <returns> An object representing collection of NamespaceResources and their operations over a NamespaceResource. </returns>
+        public virtual NamespaceCollection GetNamespaces()
         {
-            return GetCachedClient(client => new DeviceRegistryNamespaceCollection(client, Id));
+            return GetCachedClient(client => new NamespaceCollection(client, Id));
         }
 
         /// <summary>
@@ -195,7 +195,7 @@ public virtual DeviceRegistryNamespaceCollection GetDeviceRegistryNamespaces()
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -204,9 +204,9 @@ public virtual DeviceRegistryNamespaceCollection GetDeviceRegistryNamespaces()
         /// <exception cref="ArgumentNullException"> <paramref name="namespaceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual async Task<Response<DeviceRegistryNamespaceResource>> GetDeviceRegistryNamespaceAsync(string namespaceName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceResource>> GetNamespaceAsync(string namespaceName, CancellationToken cancellationToken = default)
         {
-            return await GetDeviceRegistryNamespaces().GetAsync(namespaceName, cancellationToken).ConfigureAwait(false);
+            return await GetNamespaces().GetAsync(namespaceName, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -226,7 +226,7 @@ public virtual async Task<Response<DeviceRegistryNamespaceResource>> GetDeviceRe
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -235,9 +235,9 @@ public virtual async Task<Response<DeviceRegistryNamespaceResource>> GetDeviceRe
         /// <exception cref="ArgumentNullException"> <paramref name="namespaceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual Response<DeviceRegistryNamespaceResource> GetDeviceRegistryNamespace(string namespaceName, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceResource> GetNamespace(string namespaceName, CancellationToken cancellationToken = default)
         {
-            return GetDeviceRegistryNamespaces().Get(namespaceName, cancellationToken);
+            return GetNamespaces().Get(namespaceName, cancellationToken);
         }
 
         /// <summary> Gets a collection of DeviceRegistrySchemaRegistryResources in the ResourceGroupResource. </summary>
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/MockableDeviceRegistrySubscriptionResource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/MockableDeviceRegistrySubscriptionResource.cs
index 9b708d679bbe..2bf8e55bd378 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/MockableDeviceRegistrySubscriptionResource.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Extensions/MockableDeviceRegistrySubscriptionResource.cs
@@ -21,8 +21,8 @@ public partial class MockableDeviceRegistrySubscriptionResource : ArmResource
         private AssetsRestOperations _deviceRegistryAssetAssetsRestClient;
         private ClientDiagnostics _deviceRegistryAssetEndpointProfileAssetEndpointProfilesClientDiagnostics;
         private AssetEndpointProfilesRestOperations _deviceRegistryAssetEndpointProfileAssetEndpointProfilesRestClient;
-        private ClientDiagnostics _deviceRegistryNamespaceNamespacesClientDiagnostics;
-        private NamespacesRestOperations _deviceRegistryNamespaceNamespacesRestClient;
+        private ClientDiagnostics _namespaceClientDiagnostics;
+        private NamespacesRestOperations _namespaceRestClient;
         private ClientDiagnostics _deviceRegistrySchemaRegistrySchemaRegistriesClientDiagnostics;
         private SchemaRegistriesRestOperations _deviceRegistrySchemaRegistrySchemaRegistriesRestClient;
 
@@ -42,8 +42,8 @@ internal MockableDeviceRegistrySubscriptionResource(ArmClient client, ResourceId
         private AssetsRestOperations DeviceRegistryAssetAssetsRestClient => _deviceRegistryAssetAssetsRestClient ??= new AssetsRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, GetApiVersionOrNull(DeviceRegistryAssetResource.ResourceType));
         private ClientDiagnostics DeviceRegistryAssetEndpointProfileAssetEndpointProfilesClientDiagnostics => _deviceRegistryAssetEndpointProfileAssetEndpointProfilesClientDiagnostics ??= new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", DeviceRegistryAssetEndpointProfileResource.ResourceType.Namespace, Diagnostics);
         private AssetEndpointProfilesRestOperations DeviceRegistryAssetEndpointProfileAssetEndpointProfilesRestClient => _deviceRegistryAssetEndpointProfileAssetEndpointProfilesRestClient ??= new AssetEndpointProfilesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, GetApiVersionOrNull(DeviceRegistryAssetEndpointProfileResource.ResourceType));
-        private ClientDiagnostics DeviceRegistryNamespaceNamespacesClientDiagnostics => _deviceRegistryNamespaceNamespacesClientDiagnostics ??= new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", DeviceRegistryNamespaceResource.ResourceType.Namespace, Diagnostics);
-        private NamespacesRestOperations DeviceRegistryNamespaceNamespacesRestClient => _deviceRegistryNamespaceNamespacesRestClient ??= new NamespacesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, GetApiVersionOrNull(DeviceRegistryNamespaceResource.ResourceType));
+        private ClientDiagnostics NamespaceClientDiagnostics => _namespaceClientDiagnostics ??= new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", NamespaceResource.ResourceType.Namespace, Diagnostics);
+        private NamespacesRestOperations NamespaceRestClient => _namespaceRestClient ??= new NamespacesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, GetApiVersionOrNull(NamespaceResource.ResourceType));
         private ClientDiagnostics DeviceRegistrySchemaRegistrySchemaRegistriesClientDiagnostics => _deviceRegistrySchemaRegistrySchemaRegistriesClientDiagnostics ??= new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", DeviceRegistrySchemaRegistryResource.ResourceType.Namespace, Diagnostics);
         private SchemaRegistriesRestOperations DeviceRegistrySchemaRegistrySchemaRegistriesRestClient => _deviceRegistrySchemaRegistrySchemaRegistriesRestClient ??= new SchemaRegistriesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, GetApiVersionOrNull(DeviceRegistrySchemaRegistryResource.ResourceType));
 
@@ -259,17 +259,17 @@ public virtual Pageable<DeviceRegistryAssetEndpointProfileResource> GetDeviceReg
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> An async collection of <see cref="DeviceRegistryNamespaceResource"/> that may take multiple service requests to iterate over. </returns>
-        public virtual AsyncPageable<DeviceRegistryNamespaceResource> GetDeviceRegistryNamespacesAsync(CancellationToken cancellationToken = default)
+        /// <returns> An async collection of <see cref="NamespaceResource"/> that may take multiple service requests to iterate over. </returns>
+        public virtual AsyncPageable<NamespaceResource> GetNamespacesAsync(CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => DeviceRegistryNamespaceNamespacesRestClient.CreateListBySubscriptionRequest(Id.SubscriptionId);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => DeviceRegistryNamespaceNamespacesRestClient.CreateListBySubscriptionNextPageRequest(nextLink, Id.SubscriptionId);
-            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new DeviceRegistryNamespaceResource(Client, DeviceRegistryNamespaceData.DeserializeDeviceRegistryNamespaceData(e)), DeviceRegistryNamespaceNamespacesClientDiagnostics, Pipeline, "MockableDeviceRegistrySubscriptionResource.GetDeviceRegistryNamespaces", "value", "nextLink", cancellationToken);
+            HttpMessage FirstPageRequest(int? pageSizeHint) => NamespaceRestClient.CreateListBySubscriptionRequest(Id.SubscriptionId);
+            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => NamespaceRestClient.CreateListBySubscriptionNextPageRequest(nextLink, Id.SubscriptionId);
+            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new NamespaceResource(Client, NamespaceData.DeserializeNamespaceData(e)), NamespaceClientDiagnostics, Pipeline, "MockableDeviceRegistrySubscriptionResource.GetNamespaces", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -289,17 +289,17 @@ public virtual AsyncPageable<DeviceRegistryNamespaceResource> GetDeviceRegistryN
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> A collection of <see cref="DeviceRegistryNamespaceResource"/> that may take multiple service requests to iterate over. </returns>
-        public virtual Pageable<DeviceRegistryNamespaceResource> GetDeviceRegistryNamespaces(CancellationToken cancellationToken = default)
+        /// <returns> A collection of <see cref="NamespaceResource"/> that may take multiple service requests to iterate over. </returns>
+        public virtual Pageable<NamespaceResource> GetNamespaces(CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => DeviceRegistryNamespaceNamespacesRestClient.CreateListBySubscriptionRequest(Id.SubscriptionId);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => DeviceRegistryNamespaceNamespacesRestClient.CreateListBySubscriptionNextPageRequest(nextLink, Id.SubscriptionId);
-            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new DeviceRegistryNamespaceResource(Client, DeviceRegistryNamespaceData.DeserializeDeviceRegistryNamespaceData(e)), DeviceRegistryNamespaceNamespacesClientDiagnostics, Pipeline, "MockableDeviceRegistrySubscriptionResource.GetDeviceRegistryNamespaces", "value", "nextLink", cancellationToken);
+            HttpMessage FirstPageRequest(int? pageSizeHint) => NamespaceRestClient.CreateListBySubscriptionRequest(Id.SubscriptionId);
+            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => NamespaceRestClient.CreateListBySubscriptionNextPageRequest(nextLink, Id.SubscriptionId);
+            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new NamespaceResource(Client, NamespaceData.DeserializeNamespaceData(e)), NamespaceClientDiagnostics, Pipeline, "MockableDeviceRegistrySubscriptionResource.GetNamespaces", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/DeviceRegistryNamespaceAssetOperationSource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/DeviceRegistryNamespaceAssetOperationSource.cs
deleted file mode 100644
index ea88a945651f..000000000000
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/DeviceRegistryNamespaceAssetOperationSource.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System.ClientModel.Primitives;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure.Core;
-
-namespace Azure.ResourceManager.DeviceRegistry
-{
-    internal class DeviceRegistryNamespaceAssetOperationSource : IOperationSource<DeviceRegistryNamespaceAssetResource>
-    {
-        private readonly ArmClient _client;
-
-        internal DeviceRegistryNamespaceAssetOperationSource(ArmClient client)
-        {
-            _client = client;
-        }
-
-        DeviceRegistryNamespaceAssetResource IOperationSource<DeviceRegistryNamespaceAssetResource>.CreateResult(Response response, CancellationToken cancellationToken)
-        {
-            var data = ModelReaderWriter.Read<DeviceRegistryNamespaceAssetData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
-            return new DeviceRegistryNamespaceAssetResource(_client, data);
-        }
-
-        async ValueTask<DeviceRegistryNamespaceAssetResource> IOperationSource<DeviceRegistryNamespaceAssetResource>.CreateResultAsync(Response response, CancellationToken cancellationToken)
-        {
-            var data = ModelReaderWriter.Read<DeviceRegistryNamespaceAssetData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
-            return await Task.FromResult(new DeviceRegistryNamespaceAssetResource(_client, data)).ConfigureAwait(false);
-        }
-    }
-}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/DeviceRegistryNamespaceDeviceOperationSource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/DeviceRegistryNamespaceDeviceOperationSource.cs
deleted file mode 100644
index eabee30c42b0..000000000000
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/DeviceRegistryNamespaceDeviceOperationSource.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System.ClientModel.Primitives;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure.Core;
-
-namespace Azure.ResourceManager.DeviceRegistry
-{
-    internal class DeviceRegistryNamespaceDeviceOperationSource : IOperationSource<DeviceRegistryNamespaceDeviceResource>
-    {
-        private readonly ArmClient _client;
-
-        internal DeviceRegistryNamespaceDeviceOperationSource(ArmClient client)
-        {
-            _client = client;
-        }
-
-        DeviceRegistryNamespaceDeviceResource IOperationSource<DeviceRegistryNamespaceDeviceResource>.CreateResult(Response response, CancellationToken cancellationToken)
-        {
-            var data = ModelReaderWriter.Read<DeviceRegistryNamespaceDeviceData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
-            return new DeviceRegistryNamespaceDeviceResource(_client, data);
-        }
-
-        async ValueTask<DeviceRegistryNamespaceDeviceResource> IOperationSource<DeviceRegistryNamespaceDeviceResource>.CreateResultAsync(Response response, CancellationToken cancellationToken)
-        {
-            var data = ModelReaderWriter.Read<DeviceRegistryNamespaceDeviceData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
-            return await Task.FromResult(new DeviceRegistryNamespaceDeviceResource(_client, data)).ConfigureAwait(false);
-        }
-    }
-}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/DeviceRegistryNamespaceDiscoveredAssetOperationSource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/DeviceRegistryNamespaceDiscoveredAssetOperationSource.cs
deleted file mode 100644
index c1e24e401bce..000000000000
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/DeviceRegistryNamespaceDiscoveredAssetOperationSource.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System.ClientModel.Primitives;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure.Core;
-
-namespace Azure.ResourceManager.DeviceRegistry
-{
-    internal class DeviceRegistryNamespaceDiscoveredAssetOperationSource : IOperationSource<DeviceRegistryNamespaceDiscoveredAssetResource>
-    {
-        private readonly ArmClient _client;
-
-        internal DeviceRegistryNamespaceDiscoveredAssetOperationSource(ArmClient client)
-        {
-            _client = client;
-        }
-
-        DeviceRegistryNamespaceDiscoveredAssetResource IOperationSource<DeviceRegistryNamespaceDiscoveredAssetResource>.CreateResult(Response response, CancellationToken cancellationToken)
-        {
-            var data = ModelReaderWriter.Read<DeviceRegistryNamespaceDiscoveredAssetData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
-            return new DeviceRegistryNamespaceDiscoveredAssetResource(_client, data);
-        }
-
-        async ValueTask<DeviceRegistryNamespaceDiscoveredAssetResource> IOperationSource<DeviceRegistryNamespaceDiscoveredAssetResource>.CreateResultAsync(Response response, CancellationToken cancellationToken)
-        {
-            var data = ModelReaderWriter.Read<DeviceRegistryNamespaceDiscoveredAssetData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
-            return await Task.FromResult(new DeviceRegistryNamespaceDiscoveredAssetResource(_client, data)).ConfigureAwait(false);
-        }
-    }
-}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/DeviceRegistryNamespaceDiscoveredDeviceOperationSource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/DeviceRegistryNamespaceDiscoveredDeviceOperationSource.cs
deleted file mode 100644
index 9ef95e92bc92..000000000000
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/DeviceRegistryNamespaceDiscoveredDeviceOperationSource.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System.ClientModel.Primitives;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure.Core;
-
-namespace Azure.ResourceManager.DeviceRegistry
-{
-    internal class DeviceRegistryNamespaceDiscoveredDeviceOperationSource : IOperationSource<DeviceRegistryNamespaceDiscoveredDeviceResource>
-    {
-        private readonly ArmClient _client;
-
-        internal DeviceRegistryNamespaceDiscoveredDeviceOperationSource(ArmClient client)
-        {
-            _client = client;
-        }
-
-        DeviceRegistryNamespaceDiscoveredDeviceResource IOperationSource<DeviceRegistryNamespaceDiscoveredDeviceResource>.CreateResult(Response response, CancellationToken cancellationToken)
-        {
-            var data = ModelReaderWriter.Read<DeviceRegistryNamespaceDiscoveredDeviceData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
-            return new DeviceRegistryNamespaceDiscoveredDeviceResource(_client, data);
-        }
-
-        async ValueTask<DeviceRegistryNamespaceDiscoveredDeviceResource> IOperationSource<DeviceRegistryNamespaceDiscoveredDeviceResource>.CreateResultAsync(Response response, CancellationToken cancellationToken)
-        {
-            var data = ModelReaderWriter.Read<DeviceRegistryNamespaceDiscoveredDeviceData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
-            return await Task.FromResult(new DeviceRegistryNamespaceDiscoveredDeviceResource(_client, data)).ConfigureAwait(false);
-        }
-    }
-}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/DeviceRegistryNamespaceOperationSource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/DeviceRegistryNamespaceOperationSource.cs
deleted file mode 100644
index c9911d3cb59d..000000000000
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/DeviceRegistryNamespaceOperationSource.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System.ClientModel.Primitives;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure.Core;
-
-namespace Azure.ResourceManager.DeviceRegistry
-{
-    internal class DeviceRegistryNamespaceOperationSource : IOperationSource<DeviceRegistryNamespaceResource>
-    {
-        private readonly ArmClient _client;
-
-        internal DeviceRegistryNamespaceOperationSource(ArmClient client)
-        {
-            _client = client;
-        }
-
-        DeviceRegistryNamespaceResource IOperationSource<DeviceRegistryNamespaceResource>.CreateResult(Response response, CancellationToken cancellationToken)
-        {
-            var data = ModelReaderWriter.Read<DeviceRegistryNamespaceData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
-            return new DeviceRegistryNamespaceResource(_client, data);
-        }
-
-        async ValueTask<DeviceRegistryNamespaceResource> IOperationSource<DeviceRegistryNamespaceResource>.CreateResultAsync(Response response, CancellationToken cancellationToken)
-        {
-            var data = ModelReaderWriter.Read<DeviceRegistryNamespaceData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
-            return await Task.FromResult(new DeviceRegistryNamespaceResource(_client, data)).ConfigureAwait(false);
-        }
-    }
-}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/NamespaceAssetOperationSource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/NamespaceAssetOperationSource.cs
new file mode 100644
index 000000000000..1fd92fa08400
--- /dev/null
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/NamespaceAssetOperationSource.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System.ClientModel.Primitives;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure.Core;
+
+namespace Azure.ResourceManager.DeviceRegistry
+{
+    internal class NamespaceAssetOperationSource : IOperationSource<NamespaceAssetResource>
+    {
+        private readonly ArmClient _client;
+
+        internal NamespaceAssetOperationSource(ArmClient client)
+        {
+            _client = client;
+        }
+
+        NamespaceAssetResource IOperationSource<NamespaceAssetResource>.CreateResult(Response response, CancellationToken cancellationToken)
+        {
+            var data = ModelReaderWriter.Read<NamespaceAssetData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
+            return new NamespaceAssetResource(_client, data);
+        }
+
+        async ValueTask<NamespaceAssetResource> IOperationSource<NamespaceAssetResource>.CreateResultAsync(Response response, CancellationToken cancellationToken)
+        {
+            var data = ModelReaderWriter.Read<NamespaceAssetData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
+            return await Task.FromResult(new NamespaceAssetResource(_client, data)).ConfigureAwait(false);
+        }
+    }
+}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/NamespaceDeviceOperationSource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/NamespaceDeviceOperationSource.cs
new file mode 100644
index 000000000000..cd5e6c58aa96
--- /dev/null
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/NamespaceDeviceOperationSource.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System.ClientModel.Primitives;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure.Core;
+
+namespace Azure.ResourceManager.DeviceRegistry
+{
+    internal class NamespaceDeviceOperationSource : IOperationSource<NamespaceDeviceResource>
+    {
+        private readonly ArmClient _client;
+
+        internal NamespaceDeviceOperationSource(ArmClient client)
+        {
+            _client = client;
+        }
+
+        NamespaceDeviceResource IOperationSource<NamespaceDeviceResource>.CreateResult(Response response, CancellationToken cancellationToken)
+        {
+            var data = ModelReaderWriter.Read<NamespaceDeviceData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
+            return new NamespaceDeviceResource(_client, data);
+        }
+
+        async ValueTask<NamespaceDeviceResource> IOperationSource<NamespaceDeviceResource>.CreateResultAsync(Response response, CancellationToken cancellationToken)
+        {
+            var data = ModelReaderWriter.Read<NamespaceDeviceData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
+            return await Task.FromResult(new NamespaceDeviceResource(_client, data)).ConfigureAwait(false);
+        }
+    }
+}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/NamespaceDiscoveredAssetOperationSource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/NamespaceDiscoveredAssetOperationSource.cs
new file mode 100644
index 000000000000..3fe5e9cc7beb
--- /dev/null
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/NamespaceDiscoveredAssetOperationSource.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System.ClientModel.Primitives;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure.Core;
+
+namespace Azure.ResourceManager.DeviceRegistry
+{
+    internal class NamespaceDiscoveredAssetOperationSource : IOperationSource<NamespaceDiscoveredAssetResource>
+    {
+        private readonly ArmClient _client;
+
+        internal NamespaceDiscoveredAssetOperationSource(ArmClient client)
+        {
+            _client = client;
+        }
+
+        NamespaceDiscoveredAssetResource IOperationSource<NamespaceDiscoveredAssetResource>.CreateResult(Response response, CancellationToken cancellationToken)
+        {
+            var data = ModelReaderWriter.Read<NamespaceDiscoveredAssetData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
+            return new NamespaceDiscoveredAssetResource(_client, data);
+        }
+
+        async ValueTask<NamespaceDiscoveredAssetResource> IOperationSource<NamespaceDiscoveredAssetResource>.CreateResultAsync(Response response, CancellationToken cancellationToken)
+        {
+            var data = ModelReaderWriter.Read<NamespaceDiscoveredAssetData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
+            return await Task.FromResult(new NamespaceDiscoveredAssetResource(_client, data)).ConfigureAwait(false);
+        }
+    }
+}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/NamespaceDiscoveredDeviceOperationSource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/NamespaceDiscoveredDeviceOperationSource.cs
new file mode 100644
index 000000000000..a63c15d1d0d3
--- /dev/null
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/NamespaceDiscoveredDeviceOperationSource.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System.ClientModel.Primitives;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure.Core;
+
+namespace Azure.ResourceManager.DeviceRegistry
+{
+    internal class NamespaceDiscoveredDeviceOperationSource : IOperationSource<NamespaceDiscoveredDeviceResource>
+    {
+        private readonly ArmClient _client;
+
+        internal NamespaceDiscoveredDeviceOperationSource(ArmClient client)
+        {
+            _client = client;
+        }
+
+        NamespaceDiscoveredDeviceResource IOperationSource<NamespaceDiscoveredDeviceResource>.CreateResult(Response response, CancellationToken cancellationToken)
+        {
+            var data = ModelReaderWriter.Read<NamespaceDiscoveredDeviceData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
+            return new NamespaceDiscoveredDeviceResource(_client, data);
+        }
+
+        async ValueTask<NamespaceDiscoveredDeviceResource> IOperationSource<NamespaceDiscoveredDeviceResource>.CreateResultAsync(Response response, CancellationToken cancellationToken)
+        {
+            var data = ModelReaderWriter.Read<NamespaceDiscoveredDeviceData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
+            return await Task.FromResult(new NamespaceDiscoveredDeviceResource(_client, data)).ConfigureAwait(false);
+        }
+    }
+}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/NamespaceOperationSource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/NamespaceOperationSource.cs
new file mode 100644
index 000000000000..cb4d645d8c2a
--- /dev/null
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/LongRunningOperation/NamespaceOperationSource.cs
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System.ClientModel.Primitives;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure.Core;
+
+namespace Azure.ResourceManager.DeviceRegistry
+{
+    internal class NamespaceOperationSource : IOperationSource<NamespaceResource>
+    {
+        private readonly ArmClient _client;
+
+        internal NamespaceOperationSource(ArmClient client)
+        {
+            _client = client;
+        }
+
+        NamespaceResource IOperationSource<NamespaceResource>.CreateResult(Response response, CancellationToken cancellationToken)
+        {
+            var data = ModelReaderWriter.Read<NamespaceData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
+            return new NamespaceResource(_client, data);
+        }
+
+        async ValueTask<NamespaceResource> IOperationSource<NamespaceResource>.CreateResultAsync(Response response, CancellationToken cancellationToken)
+        {
+            var data = ModelReaderWriter.Read<NamespaceData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerDeviceRegistryContext.Default);
+            return await Task.FromResult(new NamespaceResource(_client, data)).ConfigureAwait(false);
+        }
+    }
+}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/AzureResourceManagerDeviceRegistryContext.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/AzureResourceManagerDeviceRegistryContext.cs
index 86e7ca1a2cb7..6e7134187eff 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/AzureResourceManagerDeviceRegistryContext.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/AzureResourceManagerDeviceRegistryContext.cs
@@ -48,38 +48,9 @@ namespace Azure.ResourceManager.DeviceRegistry
     [ModelReaderWriterBuildable(typeof(DeviceRegistryDataPoint))]
     [ModelReaderWriterBuildable(typeof(DeviceRegistryDataPointBase))]
     [ModelReaderWriterBuildable(typeof(DeviceRegistryDataset))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryErrorDetails))]
     [ModelReaderWriterBuildable(typeof(DeviceRegistryEvent))]
     [ModelReaderWriterBuildable(typeof(DeviceRegistryEventBase))]
     [ModelReaderWriterBuildable(typeof(DeviceRegistryExtendedLocation))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceAssetData))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceAssetPatch))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceAssetProperties))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceAssetResource))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceAssetStatus))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceAssetStatusDataset))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceAssetStatusEvent))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceAssetStatusEventGroup))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceAssetStatusManagementAction))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceAssetStatusManagementGroup))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceAssetStatusStream))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceData))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceDeviceData))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceDevicePatch))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceDeviceProperties))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceDeviceResource))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceDiscoveredAssetData))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceDiscoveredAssetPatch))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceDiscoveredAssetProperties))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceDiscoveredAssetResource))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceDiscoveredDeviceData))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceDiscoveredDevicePatch))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceDiscoveredDeviceProperties))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceDiscoveredDeviceResource))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceMessageSchemaReference))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespacePatch))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceProperties))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryNamespaceResource))]
     [ModelReaderWriterBuildable(typeof(DeviceRegistrySchemaData))]
     [ModelReaderWriterBuildable(typeof(DeviceRegistrySchemaProperties))]
     [ModelReaderWriterBuildable(typeof(DeviceRegistrySchemaRegistryData))]
@@ -90,8 +61,6 @@ namespace Azure.ResourceManager.DeviceRegistry
     [ModelReaderWriterBuildable(typeof(DeviceRegistrySchemaVersionData))]
     [ModelReaderWriterBuildable(typeof(DeviceRegistrySchemaVersionProperties))]
     [ModelReaderWriterBuildable(typeof(DeviceRegistrySchemaVersionResource))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryStatusConfig))]
-    [ModelReaderWriterBuildable(typeof(DeviceRegistryStatusError))]
     [ModelReaderWriterBuildable(typeof(DeviceRegistryTopic))]
     [ModelReaderWriterBuildable(typeof(DeviceRegistryUsernamePasswordCredentials))]
     [ModelReaderWriterBuildable(typeof(DeviceRegistryX509Credentials))]
@@ -101,6 +70,7 @@ namespace Azure.ResourceManager.DeviceRegistry
     [ModelReaderWriterBuildable(typeof(DiscoveredInboundEndpoints))]
     [ModelReaderWriterBuildable(typeof(DiscoveredMessagingEndpoints))]
     [ModelReaderWriterBuildable(typeof(DiscoveredOutboundEndpoints))]
+    [ModelReaderWriterBuildable(typeof(ErrorDetails))]
     [ModelReaderWriterBuildable(typeof(EventDestination))]
     [ModelReaderWriterBuildable(typeof(EventMqttDestination))]
     [ModelReaderWriterBuildable(typeof(EventStorageDestination))]
@@ -114,17 +84,41 @@ namespace Azure.ResourceManager.DeviceRegistry
     [ModelReaderWriterBuildable(typeof(MessagingEndpoint))]
     [ModelReaderWriterBuildable(typeof(MessagingEndpoints))]
     [ModelReaderWriterBuildable(typeof(MqttDestinationConfiguration))]
+    [ModelReaderWriterBuildable(typeof(NamespaceAssetData))]
     [ModelReaderWriterBuildable(typeof(NamespaceAssetListResult))]
+    [ModelReaderWriterBuildable(typeof(NamespaceAssetPatch))]
+    [ModelReaderWriterBuildable(typeof(NamespaceAssetProperties))]
+    [ModelReaderWriterBuildable(typeof(NamespaceAssetResource))]
+    [ModelReaderWriterBuildable(typeof(NamespaceAssetStatus))]
+    [ModelReaderWriterBuildable(typeof(NamespaceAssetStatusDataset))]
+    [ModelReaderWriterBuildable(typeof(NamespaceAssetStatusEvent))]
+    [ModelReaderWriterBuildable(typeof(NamespaceAssetStatusEventGroup))]
+    [ModelReaderWriterBuildable(typeof(NamespaceAssetStatusManagementAction))]
+    [ModelReaderWriterBuildable(typeof(NamespaceAssetStatusManagementGroup))]
+    [ModelReaderWriterBuildable(typeof(NamespaceAssetStatusStream))]
     [ModelReaderWriterBuildable(typeof(NamespaceAssetUpdateProperties))]
+    [ModelReaderWriterBuildable(typeof(NamespaceData))]
     [ModelReaderWriterBuildable(typeof(NamespaceDataset))]
     [ModelReaderWriterBuildable(typeof(NamespaceDatasetDataPoint))]
+    [ModelReaderWriterBuildable(typeof(NamespaceDeviceData))]
     [ModelReaderWriterBuildable(typeof(NamespaceDeviceListResult))]
+    [ModelReaderWriterBuildable(typeof(NamespaceDevicePatch))]
+    [ModelReaderWriterBuildable(typeof(NamespaceDeviceProperties))]
+    [ModelReaderWriterBuildable(typeof(NamespaceDeviceResource))]
     [ModelReaderWriterBuildable(typeof(NamespaceDeviceUpdateProperties))]
+    [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredAssetData))]
     [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredAssetListResult))]
+    [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredAssetPatch))]
+    [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredAssetProperties))]
+    [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredAssetResource))]
     [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredAssetUpdateProperties))]
     [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredDataset))]
     [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredDatasetDataPoint))]
+    [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredDeviceData))]
     [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredDeviceListResult))]
+    [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredDevicePatch))]
+    [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredDeviceProperties))]
+    [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredDeviceResource))]
     [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredDeviceUpdateProperties))]
     [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredEvent))]
     [ModelReaderWriterBuildable(typeof(NamespaceDiscoveredEventGroup))]
@@ -134,7 +128,11 @@ namespace Azure.ResourceManager.DeviceRegistry
     [ModelReaderWriterBuildable(typeof(NamespaceEvent))]
     [ModelReaderWriterBuildable(typeof(NamespaceEventGroup))]
     [ModelReaderWriterBuildable(typeof(NamespaceListResult))]
+    [ModelReaderWriterBuildable(typeof(NamespaceMessageSchemaReference))]
     [ModelReaderWriterBuildable(typeof(NamespaceMigrateContent))]
+    [ModelReaderWriterBuildable(typeof(NamespacePatch))]
+    [ModelReaderWriterBuildable(typeof(NamespaceProperties))]
+    [ModelReaderWriterBuildable(typeof(NamespaceResource))]
     [ModelReaderWriterBuildable(typeof(NamespaceStream))]
     [ModelReaderWriterBuildable(typeof(NamespaceUpdateProperties))]
     [ModelReaderWriterBuildable(typeof(OutboundEndpoints))]
@@ -143,6 +141,8 @@ namespace Azure.ResourceManager.DeviceRegistry
     [ModelReaderWriterBuildable(typeof(SchemaRegistryListResult))]
     [ModelReaderWriterBuildable(typeof(SchemaRegistryUpdateProperties))]
     [ModelReaderWriterBuildable(typeof(SchemaVersionListResult))]
+    [ModelReaderWriterBuildable(typeof(StatusConfig))]
+    [ModelReaderWriterBuildable(typeof(StatusError))]
     [ModelReaderWriterBuildable(typeof(StorageDestinationConfiguration))]
     [ModelReaderWriterBuildable(typeof(StreamDestination))]
     [ModelReaderWriterBuildable(typeof(StreamMqttDestination))]
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatus.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatus.Serialization.cs
index 62e5b04b7c57..10c2a578f681 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatus.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatus.Serialization.cs
@@ -81,7 +81,7 @@ internal static DeviceStatus DeserializeDeviceStatus(JsonElement element, ModelR
             {
                 return null;
             }
-            DeviceRegistryStatusConfig config = default;
+            StatusConfig config = default;
             DeviceStatusEndpoints endpoints = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -93,7 +93,7 @@ internal static DeviceStatus DeserializeDeviceStatus(JsonElement element, ModelR
                     {
                         continue;
                     }
-                    config = DeviceRegistryStatusConfig.DeserializeDeviceRegistryStatusConfig(property.Value, options);
+                    config = StatusConfig.DeserializeStatusConfig(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("endpoints"u8))
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatus.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatus.cs
index 67f59d06e745..5c8eee65dda8 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatus.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatus.cs
@@ -54,7 +54,7 @@ internal DeviceStatus()
         /// <param name="config"> Defines the device status config properties. </param>
         /// <param name="endpoints"> Defines the device status for inbound/outbound endpoints. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceStatus(DeviceRegistryStatusConfig config, DeviceStatusEndpoints endpoints, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal DeviceStatus(StatusConfig config, DeviceStatusEndpoints endpoints, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Config = config;
             Endpoints = endpoints;
@@ -62,7 +62,7 @@ internal DeviceStatus(DeviceRegistryStatusConfig config, DeviceStatusEndpoints e
         }
 
         /// <summary> Defines the device status config properties. </summary>
-        public DeviceRegistryStatusConfig Config { get; }
+        public StatusConfig Config { get; }
         /// <summary> Defines the device status for inbound/outbound endpoints. </summary>
         internal DeviceStatusEndpoints Endpoints { get; }
         /// <summary> KeyValue pair representing status of inbound endpoints. </summary>
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatusEndpoint.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatusEndpoint.Serialization.cs
index 2b8fafc3638b..27fc4ded2e27 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatusEndpoint.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatusEndpoint.Serialization.cs
@@ -76,7 +76,7 @@ internal static DeviceStatusEndpoint DeserializeDeviceStatusEndpoint(JsonElement
             {
                 return null;
             }
-            DeviceRegistryStatusError error = default;
+            StatusError error = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -87,7 +87,7 @@ internal static DeviceStatusEndpoint DeserializeDeviceStatusEndpoint(JsonElement
                     {
                         continue;
                     }
-                    error = DeviceRegistryStatusError.DeserializeDeviceRegistryStatusError(property.Value, options);
+                    error = StatusError.DeserializeStatusError(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatusEndpoint.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatusEndpoint.cs
index 9249f78f625e..a25920f84a3b 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatusEndpoint.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceStatusEndpoint.cs
@@ -53,13 +53,13 @@ internal DeviceStatusEndpoint()
         /// <summary> Initializes a new instance of <see cref="DeviceStatusEndpoint"/>. </summary>
         /// <param name="error"> Defines the error related to this endpoint. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceStatusEndpoint(DeviceRegistryStatusError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal DeviceStatusEndpoint(StatusError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Error = error;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
         /// <summary> Defines the error related to this endpoint. </summary>
-        public DeviceRegistryStatusError Error { get; }
+        public StatusError Error { get; }
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryErrorDetails.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/ErrorDetails.Serialization.cs
similarity index 70%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryErrorDetails.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/ErrorDetails.Serialization.cs
index 5bbd2815bd6c..02e2694b3629 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryErrorDetails.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/ErrorDetails.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryErrorDetails : IUtf8JsonSerializable, IJsonModel<DeviceRegistryErrorDetails>
+    public partial class ErrorDetails : IUtf8JsonSerializable, IJsonModel<ErrorDetails>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryErrorDetails>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ErrorDetails>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryErrorDetails>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<ErrorDetails>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryErrorDetails>.Write(Utf8JsonWriter writer, ModelRe
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryErrorDetails>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ErrorDetails>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryErrorDetails)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(ErrorDetails)} does not support writing '{format}' format.");
             }
 
             if (options.Format != "W" && Optional.IsDefined(Code))
@@ -71,19 +71,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryErrorDetails IJsonModel<DeviceRegistryErrorDetails>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        ErrorDetails IJsonModel<ErrorDetails>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryErrorDetails>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ErrorDetails>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryErrorDetails)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(ErrorDetails)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryErrorDetails(document.RootElement, options);
+            return DeserializeErrorDetails(document.RootElement, options);
         }
 
-        internal static DeviceRegistryErrorDetails DeserializeDeviceRegistryErrorDetails(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static ErrorDetails DeserializeErrorDetails(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -125,38 +125,38 @@ internal static DeviceRegistryErrorDetails DeserializeDeviceRegistryErrorDetails
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryErrorDetails(code, message, info, correlationId, serializedAdditionalRawData);
+            return new ErrorDetails(code, message, info, correlationId, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryErrorDetails>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<ErrorDetails>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryErrorDetails>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ErrorDetails>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryErrorDetails)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ErrorDetails)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryErrorDetails IPersistableModel<DeviceRegistryErrorDetails>.Create(BinaryData data, ModelReaderWriterOptions options)
+        ErrorDetails IPersistableModel<ErrorDetails>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryErrorDetails>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<ErrorDetails>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryErrorDetails(document.RootElement, options);
+                        return DeserializeErrorDetails(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryErrorDetails)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(ErrorDetails)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryErrorDetails>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ErrorDetails>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryErrorDetails.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/ErrorDetails.cs
similarity index 87%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryErrorDetails.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/ErrorDetails.cs
index da0028fa7bc9..5d50b11282b6 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryErrorDetails.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/ErrorDetails.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> Defines the error details properties. </summary>
-    public partial class DeviceRegistryErrorDetails
+    public partial class ErrorDetails
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,18 +45,18 @@ public partial class DeviceRegistryErrorDetails
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryErrorDetails"/>. </summary>
-        internal DeviceRegistryErrorDetails()
+        /// <summary> Initializes a new instance of <see cref="ErrorDetails"/>. </summary>
+        internal ErrorDetails()
         {
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryErrorDetails"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="ErrorDetails"/>. </summary>
         /// <param name="code"> Multi-part error code for classification and root causing of errors (ex: 400.200.100.432). </param>
         /// <param name="message"> Human-readable helpful error message to provide additional context for error (ex: “Authentication method not supported”). </param>
         /// <param name="info"> Human-readable helpful detailed text context for debugging (ex: “The following mechanisms are supported...”). </param>
         /// <param name="correlationId"> Unique identifier for the transaction to aid in debugging. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryErrorDetails(string code, string message, string info, string correlationId, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal ErrorDetails(string code, string message, string info, string correlationId, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Code = code;
             Message = message;
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetListResult.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetListResult.Serialization.cs
index 55adff75e949..8dcadd056b89 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetListResult.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetListResult.Serialization.cs
@@ -83,7 +83,7 @@ internal static NamespaceAssetListResult DeserializeNamespaceAssetListResult(Jso
             {
                 return null;
             }
-            IReadOnlyList<DeviceRegistryNamespaceAssetData> value = default;
+            IReadOnlyList<NamespaceAssetData> value = default;
             Uri nextLink = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -91,10 +91,10 @@ internal static NamespaceAssetListResult DeserializeNamespaceAssetListResult(Jso
             {
                 if (property.NameEquals("value"u8))
                 {
-                    List<DeviceRegistryNamespaceAssetData> array = new List<DeviceRegistryNamespaceAssetData>();
+                    List<NamespaceAssetData> array = new List<NamespaceAssetData>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(DeviceRegistryNamespaceAssetData.DeserializeDeviceRegistryNamespaceAssetData(item, options));
+                        array.Add(NamespaceAssetData.DeserializeNamespaceAssetData(item, options));
                     }
                     value = array;
                     continue;
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetListResult.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetListResult.cs
index 95c9d4a6840c..06f853b7c61c 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetListResult.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetListResult.cs
@@ -49,7 +49,7 @@ internal partial class NamespaceAssetListResult
         /// <summary> Initializes a new instance of <see cref="NamespaceAssetListResult"/>. </summary>
         /// <param name="value"> The NamespaceAsset items on this page. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        internal NamespaceAssetListResult(IEnumerable<DeviceRegistryNamespaceAssetData> value)
+        internal NamespaceAssetListResult(IEnumerable<NamespaceAssetData> value)
         {
             Argument.AssertNotNull(value, nameof(value));
 
@@ -60,7 +60,7 @@ internal NamespaceAssetListResult(IEnumerable<DeviceRegistryNamespaceAssetData>
         /// <param name="value"> The NamespaceAsset items on this page. </param>
         /// <param name="nextLink"> The link to the next page of items. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal NamespaceAssetListResult(IReadOnlyList<DeviceRegistryNamespaceAssetData> value, Uri nextLink, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceAssetListResult(IReadOnlyList<NamespaceAssetData> value, Uri nextLink, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Value = value;
             NextLink = nextLink;
@@ -73,7 +73,7 @@ internal NamespaceAssetListResult()
         }
 
         /// <summary> The NamespaceAsset items on this page. </summary>
-        public IReadOnlyList<DeviceRegistryNamespaceAssetData> Value { get; }
+        public IReadOnlyList<NamespaceAssetData> Value { get; }
         /// <summary> The link to the next page of items. </summary>
         public Uri NextLink { get; }
     }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetPatch.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetPatch.Serialization.cs
similarity index 68%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetPatch.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetPatch.Serialization.cs
index d77b88822a56..5cf2c8f0b2fb 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetPatch.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetPatch.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceAssetPatch : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceAssetPatch>
+    public partial class NamespaceAssetPatch : IUtf8JsonSerializable, IJsonModel<NamespaceAssetPatch>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceAssetPatch>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceAssetPatch>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceAssetPatch>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceAssetPatch>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceAssetPatch>.Write(Utf8JsonWriter writer,
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetPatch)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetPatch)} does not support writing '{format}' format.");
             }
 
             if (Optional.IsCollectionDefined(Tags))
@@ -67,19 +67,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceAssetPatch IJsonModel<DeviceRegistryNamespaceAssetPatch>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceAssetPatch IJsonModel<NamespaceAssetPatch>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetPatch)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetPatch)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceAssetPatch(document.RootElement, options);
+            return DeserializeNamespaceAssetPatch(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceAssetPatch DeserializeDeviceRegistryNamespaceAssetPatch(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceAssetPatch DeserializeNamespaceAssetPatch(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -122,38 +122,38 @@ internal static DeviceRegistryNamespaceAssetPatch DeserializeDeviceRegistryNames
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceAssetPatch(tags ?? new ChangeTrackingDictionary<string, string>(), properties, serializedAdditionalRawData);
+            return new NamespaceAssetPatch(tags ?? new ChangeTrackingDictionary<string, string>(), properties, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceAssetPatch>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceAssetPatch>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetPatch)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetPatch)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceAssetPatch IPersistableModel<DeviceRegistryNamespaceAssetPatch>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceAssetPatch IPersistableModel<NamespaceAssetPatch>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceAssetPatch(document.RootElement, options);
+                        return DeserializeNamespaceAssetPatch(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetPatch)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetPatch)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceAssetPatch>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceAssetPatch>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetPatch.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetPatch.cs
similarity index 82%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetPatch.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetPatch.cs
index cc8852c8ecbc..4d8d465459d2 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetPatch.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetPatch.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> The type used for update operations of the NamespaceAsset. </summary>
-    public partial class DeviceRegistryNamespaceAssetPatch
+    public partial class NamespaceAssetPatch
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,17 +45,17 @@ public partial class DeviceRegistryNamespaceAssetPatch
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetPatch"/>. </summary>
-        public DeviceRegistryNamespaceAssetPatch()
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetPatch"/>. </summary>
+        public NamespaceAssetPatch()
         {
             Tags = new ChangeTrackingDictionary<string, string>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetPatch"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetPatch"/>. </summary>
         /// <param name="tags"> Resource tags. </param>
         /// <param name="properties"> The resource-specific properties for this resource. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceAssetPatch(IDictionary<string, string> tags, NamespaceAssetUpdateProperties properties, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceAssetPatch(IDictionary<string, string> tags, NamespaceAssetUpdateProperties properties, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Tags = tags;
             Properties = properties;
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetProperties.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetProperties.Serialization.cs
similarity index 91%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetProperties.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetProperties.Serialization.cs
index d9adf07d43c3..58b20d64ac65 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetProperties.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetProperties.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceAssetProperties : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceAssetProperties>
+    public partial class NamespaceAssetProperties : IUtf8JsonSerializable, IJsonModel<NamespaceAssetProperties>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceAssetProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceAssetProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceAssetProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceAssetProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceAssetProperties>.Write(Utf8JsonWriter wri
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetProperties)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetProperties)} does not support writing '{format}' format.");
             }
 
             if (options.Format != "W" && Optional.IsDefined(Uuid))
@@ -271,19 +271,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceAssetProperties IJsonModel<DeviceRegistryNamespaceAssetProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceAssetProperties IJsonModel<NamespaceAssetProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetProperties)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetProperties)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceAssetProperties(document.RootElement, options);
+            return DeserializeNamespaceAssetProperties(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceAssetProperties DeserializeDeviceRegistryNamespaceAssetProperties(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceAssetProperties DeserializeNamespaceAssetProperties(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -321,7 +321,7 @@ internal static DeviceRegistryNamespaceAssetProperties DeserializeDeviceRegistry
             IList<NamespaceEventGroup> eventGroups = default;
             IList<NamespaceStream> streams = default;
             IList<ManagementGroup> managementGroups = default;
-            DeviceRegistryNamespaceAssetStatus status = default;
+            NamespaceAssetStatus status = default;
             DeviceRegistryProvisioningState? provisioningState = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -592,7 +592,7 @@ internal static DeviceRegistryNamespaceAssetProperties DeserializeDeviceRegistry
                     {
                         continue;
                     }
-                    status = DeviceRegistryNamespaceAssetStatus.DeserializeDeviceRegistryNamespaceAssetStatus(property.Value, options);
+                    status = NamespaceAssetStatus.DeserializeNamespaceAssetStatus(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("provisioningState"u8))
@@ -610,7 +610,7 @@ internal static DeviceRegistryNamespaceAssetProperties DeserializeDeviceRegistry
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceAssetProperties(
+            return new NamespaceAssetProperties(
                 uuid,
                 enabled,
                 externalAssetId,
@@ -646,35 +646,35 @@ internal static DeviceRegistryNamespaceAssetProperties DeserializeDeviceRegistry
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceAssetProperties>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceAssetProperties>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetProperties)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetProperties)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceAssetProperties IPersistableModel<DeviceRegistryNamespaceAssetProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceAssetProperties IPersistableModel<NamespaceAssetProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceAssetProperties(document.RootElement, options);
+                        return DeserializeNamespaceAssetProperties(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetProperties)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetProperties)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceAssetProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceAssetProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetProperties.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetProperties.cs
similarity index 90%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetProperties.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetProperties.cs
index f84d13d7c617..54ea963dd7fd 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetProperties.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetProperties.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> Defines the asset properties. </summary>
-    public partial class DeviceRegistryNamespaceAssetProperties
+    public partial class NamespaceAssetProperties
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,10 +45,10 @@ public partial class DeviceRegistryNamespaceAssetProperties
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetProperties"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetProperties"/>. </summary>
         /// <param name="deviceRef"> Reference to the device that provides data for this asset. Must provide device name &amp; endpoint on the device to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="deviceRef"/> is null. </exception>
-        public DeviceRegistryNamespaceAssetProperties(DeviceRef deviceRef)
+        public NamespaceAssetProperties(DeviceRef deviceRef)
         {
             Argument.AssertNotNull(deviceRef, nameof(deviceRef));
 
@@ -65,7 +65,7 @@ public DeviceRegistryNamespaceAssetProperties(DeviceRef deviceRef)
             ManagementGroups = new ChangeTrackingList<ManagementGroup>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetProperties"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetProperties"/>. </summary>
         /// <param name="uuid"> Globally unique, immutable, non-reusable ID. </param>
         /// <param name="enabled"> Enabled/disabled status of the asset. </param>
         /// <param name="externalAssetId"> Asset ID provided by the customer. </param>
@@ -111,7 +111,7 @@ public DeviceRegistryNamespaceAssetProperties(DeviceRef deviceRef)
         /// <param name="status"> Read only object to reflect changes that have occurred on the Edge. Similar to Kubernetes status property for custom resources. </param>
         /// <param name="provisioningState"> Provisioning state of the resource. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceAssetProperties(string uuid, bool? enabled, string externalAssetId, string displayName, string description, DeviceRef deviceRef, IList<string> assetTypeRefs, long? version, DateTimeOffset? lastTransitionOn, string manufacturer, string manufacturerUri, string model, string productCode, string hardwareRevision, string softwareRevision, string documentationUri, string serialNumber, IDictionary<string, BinaryData> attributes, IList<string> discoveredAssetRefs, string defaultDatasetsConfiguration, string defaultEventsConfiguration, string defaultStreamsConfiguration, string defaultManagementGroupsConfiguration, IList<DatasetDestination> defaultDatasetsDestinations, IList<EventDestination> defaultEventsDestinations, IList<StreamDestination> defaultStreamsDestinations, IList<NamespaceDataset> datasets, IList<NamespaceEventGroup> eventGroups, IList<NamespaceStream> streams, IList<ManagementGroup> managementGroups, DeviceRegistryNamespaceAssetStatus status, DeviceRegistryProvisioningState? provisioningState, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceAssetProperties(string uuid, bool? enabled, string externalAssetId, string displayName, string description, DeviceRef deviceRef, IList<string> assetTypeRefs, long? version, DateTimeOffset? lastTransitionOn, string manufacturer, string manufacturerUri, string model, string productCode, string hardwareRevision, string softwareRevision, string documentationUri, string serialNumber, IDictionary<string, BinaryData> attributes, IList<string> discoveredAssetRefs, string defaultDatasetsConfiguration, string defaultEventsConfiguration, string defaultStreamsConfiguration, string defaultManagementGroupsConfiguration, IList<DatasetDestination> defaultDatasetsDestinations, IList<EventDestination> defaultEventsDestinations, IList<StreamDestination> defaultStreamsDestinations, IList<NamespaceDataset> datasets, IList<NamespaceEventGroup> eventGroups, IList<NamespaceStream> streams, IList<ManagementGroup> managementGroups, NamespaceAssetStatus status, DeviceRegistryProvisioningState? provisioningState, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Uuid = uuid;
             Enabled = enabled;
@@ -148,8 +148,8 @@ internal DeviceRegistryNamespaceAssetProperties(string uuid, bool? enabled, stri
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetProperties"/> for deserialization. </summary>
-        internal DeviceRegistryNamespaceAssetProperties()
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetProperties"/> for deserialization. </summary>
+        internal NamespaceAssetProperties()
         {
         }
 
@@ -255,7 +255,7 @@ internal DeviceRegistryNamespaceAssetProperties()
         /// <summary> Array of management groups that are part of the asset. Each management group can have a per-group configuration. </summary>
         public IList<ManagementGroup> ManagementGroups { get; }
         /// <summary> Read only object to reflect changes that have occurred on the Edge. Similar to Kubernetes status property for custom resources. </summary>
-        public DeviceRegistryNamespaceAssetStatus Status { get; }
+        public NamespaceAssetStatus Status { get; }
         /// <summary> Provisioning state of the resource. </summary>
         public DeviceRegistryProvisioningState? ProvisioningState { get; }
     }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatus.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatus.Serialization.cs
similarity index 62%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatus.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatus.Serialization.cs
index c314ae3b4500..3cfde4ac758b 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatus.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatus.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceAssetStatus : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceAssetStatus>
+    public partial class NamespaceAssetStatus : IUtf8JsonSerializable, IJsonModel<NamespaceAssetStatus>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceAssetStatus>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceAssetStatus>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceAssetStatus>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceAssetStatus>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceAssetStatus>.Write(Utf8JsonWriter writer,
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatus>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatus>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatus)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetStatus)} does not support writing '{format}' format.");
             }
 
             if (options.Format != "W" && Optional.IsDefined(Config))
@@ -96,19 +96,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceAssetStatus IJsonModel<DeviceRegistryNamespaceAssetStatus>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceAssetStatus IJsonModel<NamespaceAssetStatus>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatus>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatus>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatus)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetStatus)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceAssetStatus(document.RootElement, options);
+            return DeserializeNamespaceAssetStatus(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceAssetStatus DeserializeDeviceRegistryNamespaceAssetStatus(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceAssetStatus DeserializeNamespaceAssetStatus(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -116,11 +116,11 @@ internal static DeviceRegistryNamespaceAssetStatus DeserializeDeviceRegistryName
             {
                 return null;
             }
-            DeviceRegistryStatusConfig config = default;
-            IReadOnlyList<DeviceRegistryNamespaceAssetStatusDataset> datasets = default;
-            IReadOnlyList<DeviceRegistryNamespaceAssetStatusEventGroup> eventGroups = default;
-            IReadOnlyList<DeviceRegistryNamespaceAssetStatusStream> streams = default;
-            IReadOnlyList<DeviceRegistryNamespaceAssetStatusManagementGroup> managementGroups = default;
+            StatusConfig config = default;
+            IReadOnlyList<NamespaceAssetStatusDataset> datasets = default;
+            IReadOnlyList<NamespaceAssetStatusEventGroup> eventGroups = default;
+            IReadOnlyList<NamespaceAssetStatusStream> streams = default;
+            IReadOnlyList<NamespaceAssetStatusManagementGroup> managementGroups = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -131,7 +131,7 @@ internal static DeviceRegistryNamespaceAssetStatus DeserializeDeviceRegistryName
                     {
                         continue;
                     }
-                    config = DeviceRegistryStatusConfig.DeserializeDeviceRegistryStatusConfig(property.Value, options);
+                    config = StatusConfig.DeserializeStatusConfig(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("datasets"u8))
@@ -140,10 +140,10 @@ internal static DeviceRegistryNamespaceAssetStatus DeserializeDeviceRegistryName
                     {
                         continue;
                     }
-                    List<DeviceRegistryNamespaceAssetStatusDataset> array = new List<DeviceRegistryNamespaceAssetStatusDataset>();
+                    List<NamespaceAssetStatusDataset> array = new List<NamespaceAssetStatusDataset>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(DeviceRegistryNamespaceAssetStatusDataset.DeserializeDeviceRegistryNamespaceAssetStatusDataset(item, options));
+                        array.Add(NamespaceAssetStatusDataset.DeserializeNamespaceAssetStatusDataset(item, options));
                     }
                     datasets = array;
                     continue;
@@ -154,10 +154,10 @@ internal static DeviceRegistryNamespaceAssetStatus DeserializeDeviceRegistryName
                     {
                         continue;
                     }
-                    List<DeviceRegistryNamespaceAssetStatusEventGroup> array = new List<DeviceRegistryNamespaceAssetStatusEventGroup>();
+                    List<NamespaceAssetStatusEventGroup> array = new List<NamespaceAssetStatusEventGroup>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(DeviceRegistryNamespaceAssetStatusEventGroup.DeserializeDeviceRegistryNamespaceAssetStatusEventGroup(item, options));
+                        array.Add(NamespaceAssetStatusEventGroup.DeserializeNamespaceAssetStatusEventGroup(item, options));
                     }
                     eventGroups = array;
                     continue;
@@ -168,10 +168,10 @@ internal static DeviceRegistryNamespaceAssetStatus DeserializeDeviceRegistryName
                     {
                         continue;
                     }
-                    List<DeviceRegistryNamespaceAssetStatusStream> array = new List<DeviceRegistryNamespaceAssetStatusStream>();
+                    List<NamespaceAssetStatusStream> array = new List<NamespaceAssetStatusStream>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(DeviceRegistryNamespaceAssetStatusStream.DeserializeDeviceRegistryNamespaceAssetStatusStream(item, options));
+                        array.Add(NamespaceAssetStatusStream.DeserializeNamespaceAssetStatusStream(item, options));
                     }
                     streams = array;
                     continue;
@@ -182,10 +182,10 @@ internal static DeviceRegistryNamespaceAssetStatus DeserializeDeviceRegistryName
                     {
                         continue;
                     }
-                    List<DeviceRegistryNamespaceAssetStatusManagementGroup> array = new List<DeviceRegistryNamespaceAssetStatusManagementGroup>();
+                    List<NamespaceAssetStatusManagementGroup> array = new List<NamespaceAssetStatusManagementGroup>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(DeviceRegistryNamespaceAssetStatusManagementGroup.DeserializeDeviceRegistryNamespaceAssetStatusManagementGroup(item, options));
+                        array.Add(NamespaceAssetStatusManagementGroup.DeserializeNamespaceAssetStatusManagementGroup(item, options));
                     }
                     managementGroups = array;
                     continue;
@@ -196,44 +196,44 @@ internal static DeviceRegistryNamespaceAssetStatus DeserializeDeviceRegistryName
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceAssetStatus(
+            return new NamespaceAssetStatus(
                 config,
-                datasets ?? new ChangeTrackingList<DeviceRegistryNamespaceAssetStatusDataset>(),
-                eventGroups ?? new ChangeTrackingList<DeviceRegistryNamespaceAssetStatusEventGroup>(),
-                streams ?? new ChangeTrackingList<DeviceRegistryNamespaceAssetStatusStream>(),
-                managementGroups ?? new ChangeTrackingList<DeviceRegistryNamespaceAssetStatusManagementGroup>(),
+                datasets ?? new ChangeTrackingList<NamespaceAssetStatusDataset>(),
+                eventGroups ?? new ChangeTrackingList<NamespaceAssetStatusEventGroup>(),
+                streams ?? new ChangeTrackingList<NamespaceAssetStatusStream>(),
+                managementGroups ?? new ChangeTrackingList<NamespaceAssetStatusManagementGroup>(),
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceAssetStatus>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceAssetStatus>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatus>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatus>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatus)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetStatus)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceAssetStatus IPersistableModel<DeviceRegistryNamespaceAssetStatus>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceAssetStatus IPersistableModel<NamespaceAssetStatus>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatus>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatus>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceAssetStatus(document.RootElement, options);
+                        return DeserializeNamespaceAssetStatus(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatus)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetStatus)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceAssetStatus>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceAssetStatus>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatus.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatus.cs
similarity index 66%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatus.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatus.cs
index 4560b7662bb1..d4bf37cf1e81 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatus.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatus.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> Defines the asset status properties. </summary>
-    public partial class DeviceRegistryNamespaceAssetStatus
+    public partial class NamespaceAssetStatus
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,23 +45,23 @@ public partial class DeviceRegistryNamespaceAssetStatus
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatus"/>. </summary>
-        internal DeviceRegistryNamespaceAssetStatus()
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatus"/>. </summary>
+        internal NamespaceAssetStatus()
         {
-            Datasets = new ChangeTrackingList<DeviceRegistryNamespaceAssetStatusDataset>();
-            EventGroups = new ChangeTrackingList<DeviceRegistryNamespaceAssetStatusEventGroup>();
-            Streams = new ChangeTrackingList<DeviceRegistryNamespaceAssetStatusStream>();
-            ManagementGroups = new ChangeTrackingList<DeviceRegistryNamespaceAssetStatusManagementGroup>();
+            Datasets = new ChangeTrackingList<NamespaceAssetStatusDataset>();
+            EventGroups = new ChangeTrackingList<NamespaceAssetStatusEventGroup>();
+            Streams = new ChangeTrackingList<NamespaceAssetStatusStream>();
+            ManagementGroups = new ChangeTrackingList<NamespaceAssetStatusManagementGroup>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatus"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatus"/>. </summary>
         /// <param name="config"> Defines the asset status config properties. </param>
         /// <param name="datasets"> Array of dataset statuses that describe the status of each dataset. </param>
         /// <param name="eventGroups"> Array of event group statuses that describe the status of each event group. </param>
         /// <param name="streams"> Array of stream statuses that describe the status of each stream. </param>
         /// <param name="managementGroups"> Array of management group statuses that describe the status of each management group. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceAssetStatus(DeviceRegistryStatusConfig config, IReadOnlyList<DeviceRegistryNamespaceAssetStatusDataset> datasets, IReadOnlyList<DeviceRegistryNamespaceAssetStatusEventGroup> eventGroups, IReadOnlyList<DeviceRegistryNamespaceAssetStatusStream> streams, IReadOnlyList<DeviceRegistryNamespaceAssetStatusManagementGroup> managementGroups, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceAssetStatus(StatusConfig config, IReadOnlyList<NamespaceAssetStatusDataset> datasets, IReadOnlyList<NamespaceAssetStatusEventGroup> eventGroups, IReadOnlyList<NamespaceAssetStatusStream> streams, IReadOnlyList<NamespaceAssetStatusManagementGroup> managementGroups, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Config = config;
             Datasets = datasets;
@@ -72,14 +72,14 @@ internal DeviceRegistryNamespaceAssetStatus(DeviceRegistryStatusConfig config, I
         }
 
         /// <summary> Defines the asset status config properties. </summary>
-        public DeviceRegistryStatusConfig Config { get; }
+        public StatusConfig Config { get; }
         /// <summary> Array of dataset statuses that describe the status of each dataset. </summary>
-        public IReadOnlyList<DeviceRegistryNamespaceAssetStatusDataset> Datasets { get; }
+        public IReadOnlyList<NamespaceAssetStatusDataset> Datasets { get; }
         /// <summary> Array of event group statuses that describe the status of each event group. </summary>
-        public IReadOnlyList<DeviceRegistryNamespaceAssetStatusEventGroup> EventGroups { get; }
+        public IReadOnlyList<NamespaceAssetStatusEventGroup> EventGroups { get; }
         /// <summary> Array of stream statuses that describe the status of each stream. </summary>
-        public IReadOnlyList<DeviceRegistryNamespaceAssetStatusStream> Streams { get; }
+        public IReadOnlyList<NamespaceAssetStatusStream> Streams { get; }
         /// <summary> Array of management group statuses that describe the status of each management group. </summary>
-        public IReadOnlyList<DeviceRegistryNamespaceAssetStatusManagementGroup> ManagementGroups { get; }
+        public IReadOnlyList<NamespaceAssetStatusManagementGroup> ManagementGroups { get; }
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusStream.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusDataset.Serialization.cs
similarity index 62%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusStream.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusDataset.Serialization.cs
index 2e53be63d355..1284e5c2d0e9 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusStream.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusDataset.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceAssetStatusStream : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceAssetStatusStream>
+    public partial class NamespaceAssetStatusDataset : IUtf8JsonSerializable, IJsonModel<NamespaceAssetStatusDataset>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceAssetStatusStream>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceAssetStatusDataset>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceAssetStatusStream>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceAssetStatusDataset>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceAssetStatusStream>.Write(Utf8JsonWriter w
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusStream>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusDataset>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusStream)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetStatusDataset)} does not support writing '{format}' format.");
             }
 
             if (options.Format != "W")
@@ -66,19 +66,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceAssetStatusStream IJsonModel<DeviceRegistryNamespaceAssetStatusStream>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceAssetStatusDataset IJsonModel<NamespaceAssetStatusDataset>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusStream>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusDataset>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusStream)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetStatusDataset)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceAssetStatusStream(document.RootElement, options);
+            return DeserializeNamespaceAssetStatusDataset(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceAssetStatusStream DeserializeDeviceRegistryNamespaceAssetStatusStream(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceAssetStatusDataset DeserializeNamespaceAssetStatusDataset(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -87,8 +87,8 @@ internal static DeviceRegistryNamespaceAssetStatusStream DeserializeDeviceRegist
                 return null;
             }
             string name = default;
-            DeviceRegistryNamespaceMessageSchemaReference messageSchemaReference = default;
-            DeviceRegistryStatusError error = default;
+            NamespaceMessageSchemaReference messageSchemaReference = default;
+            StatusError error = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -104,7 +104,7 @@ internal static DeviceRegistryNamespaceAssetStatusStream DeserializeDeviceRegist
                     {
                         continue;
                     }
-                    messageSchemaReference = DeviceRegistryNamespaceMessageSchemaReference.DeserializeDeviceRegistryNamespaceMessageSchemaReference(property.Value, options);
+                    messageSchemaReference = NamespaceMessageSchemaReference.DeserializeNamespaceMessageSchemaReference(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("error"u8))
@@ -113,7 +113,7 @@ internal static DeviceRegistryNamespaceAssetStatusStream DeserializeDeviceRegist
                     {
                         continue;
                     }
-                    error = DeviceRegistryStatusError.DeserializeDeviceRegistryStatusError(property.Value, options);
+                    error = StatusError.DeserializeStatusError(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
@@ -122,38 +122,38 @@ internal static DeviceRegistryNamespaceAssetStatusStream DeserializeDeviceRegist
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceAssetStatusStream(name, messageSchemaReference, error, serializedAdditionalRawData);
+            return new NamespaceAssetStatusDataset(name, messageSchemaReference, error, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceAssetStatusStream>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceAssetStatusDataset>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusStream>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusDataset>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusStream)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetStatusDataset)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceAssetStatusStream IPersistableModel<DeviceRegistryNamespaceAssetStatusStream>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceAssetStatusDataset IPersistableModel<NamespaceAssetStatusDataset>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusStream>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusDataset>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceAssetStatusStream(document.RootElement, options);
+                        return DeserializeNamespaceAssetStatusDataset(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusStream)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetStatusDataset)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceAssetStatusStream>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceAssetStatusDataset>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusDataset.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusDataset.cs
similarity index 76%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusDataset.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusDataset.cs
index fe9878e4310d..3293f26ba2ea 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusDataset.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusDataset.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> Defines the asset status dataset properties. </summary>
-    public partial class DeviceRegistryNamespaceAssetStatusDataset
+    public partial class NamespaceAssetStatusDataset
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,19 +45,19 @@ public partial class DeviceRegistryNamespaceAssetStatusDataset
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusDataset"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusDataset"/>. </summary>
         /// <param name="name"> The name of the dataset. Must be unique within the status.datasets array. This name is used to correlate between the spec and status dataset information. </param>
-        internal DeviceRegistryNamespaceAssetStatusDataset(string name)
+        internal NamespaceAssetStatusDataset(string name)
         {
             Name = name;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusDataset"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusDataset"/>. </summary>
         /// <param name="name"> The name of the dataset. Must be unique within the status.datasets array. This name is used to correlate between the spec and status dataset information. </param>
         /// <param name="messageSchemaReference"> The message schema reference object. </param>
         /// <param name="error"> Object to transfer and persist errors that originate from the edge. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceAssetStatusDataset(string name, DeviceRegistryNamespaceMessageSchemaReference messageSchemaReference, DeviceRegistryStatusError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceAssetStatusDataset(string name, NamespaceMessageSchemaReference messageSchemaReference, StatusError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Name = name;
             MessageSchemaReference = messageSchemaReference;
@@ -65,16 +65,16 @@ internal DeviceRegistryNamespaceAssetStatusDataset(string name, DeviceRegistryNa
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusDataset"/> for deserialization. </summary>
-        internal DeviceRegistryNamespaceAssetStatusDataset()
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusDataset"/> for deserialization. </summary>
+        internal NamespaceAssetStatusDataset()
         {
         }
 
         /// <summary> The name of the dataset. Must be unique within the status.datasets array. This name is used to correlate between the spec and status dataset information. </summary>
         public string Name { get; }
         /// <summary> The message schema reference object. </summary>
-        public DeviceRegistryNamespaceMessageSchemaReference MessageSchemaReference { get; }
+        public NamespaceMessageSchemaReference MessageSchemaReference { get; }
         /// <summary> Object to transfer and persist errors that originate from the edge. </summary>
-        public DeviceRegistryStatusError Error { get; }
+        public StatusError Error { get; }
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusEvent.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusEvent.Serialization.cs
similarity index 62%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusEvent.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusEvent.Serialization.cs
index 5d37133cc585..03350e899345 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusEvent.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusEvent.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceAssetStatusEvent : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceAssetStatusEvent>
+    public partial class NamespaceAssetStatusEvent : IUtf8JsonSerializable, IJsonModel<NamespaceAssetStatusEvent>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceAssetStatusEvent>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceAssetStatusEvent>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceAssetStatusEvent>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceAssetStatusEvent>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceAssetStatusEvent>.Write(Utf8JsonWriter wr
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusEvent>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusEvent>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusEvent)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetStatusEvent)} does not support writing '{format}' format.");
             }
 
             if (options.Format != "W")
@@ -66,19 +66,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceAssetStatusEvent IJsonModel<DeviceRegistryNamespaceAssetStatusEvent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceAssetStatusEvent IJsonModel<NamespaceAssetStatusEvent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusEvent>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusEvent>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusEvent)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetStatusEvent)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceAssetStatusEvent(document.RootElement, options);
+            return DeserializeNamespaceAssetStatusEvent(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceAssetStatusEvent DeserializeDeviceRegistryNamespaceAssetStatusEvent(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceAssetStatusEvent DeserializeNamespaceAssetStatusEvent(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -87,8 +87,8 @@ internal static DeviceRegistryNamespaceAssetStatusEvent DeserializeDeviceRegistr
                 return null;
             }
             string name = default;
-            DeviceRegistryNamespaceMessageSchemaReference messageSchemaReference = default;
-            DeviceRegistryStatusError error = default;
+            NamespaceMessageSchemaReference messageSchemaReference = default;
+            StatusError error = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -104,7 +104,7 @@ internal static DeviceRegistryNamespaceAssetStatusEvent DeserializeDeviceRegistr
                     {
                         continue;
                     }
-                    messageSchemaReference = DeviceRegistryNamespaceMessageSchemaReference.DeserializeDeviceRegistryNamespaceMessageSchemaReference(property.Value, options);
+                    messageSchemaReference = NamespaceMessageSchemaReference.DeserializeNamespaceMessageSchemaReference(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("error"u8))
@@ -113,7 +113,7 @@ internal static DeviceRegistryNamespaceAssetStatusEvent DeserializeDeviceRegistr
                     {
                         continue;
                     }
-                    error = DeviceRegistryStatusError.DeserializeDeviceRegistryStatusError(property.Value, options);
+                    error = StatusError.DeserializeStatusError(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
@@ -122,38 +122,38 @@ internal static DeviceRegistryNamespaceAssetStatusEvent DeserializeDeviceRegistr
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceAssetStatusEvent(name, messageSchemaReference, error, serializedAdditionalRawData);
+            return new NamespaceAssetStatusEvent(name, messageSchemaReference, error, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceAssetStatusEvent>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceAssetStatusEvent>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusEvent>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusEvent>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusEvent)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetStatusEvent)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceAssetStatusEvent IPersistableModel<DeviceRegistryNamespaceAssetStatusEvent>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceAssetStatusEvent IPersistableModel<NamespaceAssetStatusEvent>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusEvent>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusEvent>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceAssetStatusEvent(document.RootElement, options);
+                        return DeserializeNamespaceAssetStatusEvent(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusEvent)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetStatusEvent)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceAssetStatusEvent>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceAssetStatusEvent>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusEvent.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusEvent.cs
similarity index 76%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusEvent.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusEvent.cs
index 050ef186c219..69a0ab7daaf4 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusEvent.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusEvent.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> Defines the asset status event properties. </summary>
-    public partial class DeviceRegistryNamespaceAssetStatusEvent
+    public partial class NamespaceAssetStatusEvent
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,19 +45,19 @@ public partial class DeviceRegistryNamespaceAssetStatusEvent
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusEvent"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusEvent"/>. </summary>
         /// <param name="name"> The name of the event. Must be unique within the status.events array. This name is used to correlate between the spec and status event information. </param>
-        internal DeviceRegistryNamespaceAssetStatusEvent(string name)
+        internal NamespaceAssetStatusEvent(string name)
         {
             Name = name;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusEvent"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusEvent"/>. </summary>
         /// <param name="name"> The name of the event. Must be unique within the status.events array. This name is used to correlate between the spec and status event information. </param>
         /// <param name="messageSchemaReference"> The message schema reference object. </param>
         /// <param name="error"> Object to transfer and persist errors that originate from the edge. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceAssetStatusEvent(string name, DeviceRegistryNamespaceMessageSchemaReference messageSchemaReference, DeviceRegistryStatusError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceAssetStatusEvent(string name, NamespaceMessageSchemaReference messageSchemaReference, StatusError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Name = name;
             MessageSchemaReference = messageSchemaReference;
@@ -65,16 +65,16 @@ internal DeviceRegistryNamespaceAssetStatusEvent(string name, DeviceRegistryName
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusEvent"/> for deserialization. </summary>
-        internal DeviceRegistryNamespaceAssetStatusEvent()
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusEvent"/> for deserialization. </summary>
+        internal NamespaceAssetStatusEvent()
         {
         }
 
         /// <summary> The name of the event. Must be unique within the status.events array. This name is used to correlate between the spec and status event information. </summary>
         public string Name { get; }
         /// <summary> The message schema reference object. </summary>
-        public DeviceRegistryNamespaceMessageSchemaReference MessageSchemaReference { get; }
+        public NamespaceMessageSchemaReference MessageSchemaReference { get; }
         /// <summary> Object to transfer and persist errors that originate from the edge. </summary>
-        public DeviceRegistryStatusError Error { get; }
+        public StatusError Error { get; }
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusEventGroup.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusEventGroup.Serialization.cs
similarity index 60%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusEventGroup.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusEventGroup.Serialization.cs
index f8769c339744..6036b7116b76 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusEventGroup.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusEventGroup.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceAssetStatusEventGroup : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceAssetStatusEventGroup>
+    public partial class NamespaceAssetStatusEventGroup : IUtf8JsonSerializable, IJsonModel<NamespaceAssetStatusEventGroup>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceAssetStatusEventGroup>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceAssetStatusEventGroup>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceAssetStatusEventGroup>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceAssetStatusEventGroup>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceAssetStatusEventGroup>.Write(Utf8JsonWrit
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusEventGroup>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusEventGroup>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusEventGroup)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetStatusEventGroup)} does not support writing '{format}' format.");
             }
 
             if (options.Format != "W")
@@ -66,19 +66,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceAssetStatusEventGroup IJsonModel<DeviceRegistryNamespaceAssetStatusEventGroup>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceAssetStatusEventGroup IJsonModel<NamespaceAssetStatusEventGroup>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusEventGroup>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusEventGroup>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusEventGroup)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetStatusEventGroup)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceAssetStatusEventGroup(document.RootElement, options);
+            return DeserializeNamespaceAssetStatusEventGroup(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceAssetStatusEventGroup DeserializeDeviceRegistryNamespaceAssetStatusEventGroup(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceAssetStatusEventGroup DeserializeNamespaceAssetStatusEventGroup(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -87,7 +87,7 @@ internal static DeviceRegistryNamespaceAssetStatusEventGroup DeserializeDeviceRe
                 return null;
             }
             string name = default;
-            IReadOnlyList<DeviceRegistryNamespaceAssetStatusEvent> events = default;
+            IReadOnlyList<NamespaceAssetStatusEvent> events = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -103,10 +103,10 @@ internal static DeviceRegistryNamespaceAssetStatusEventGroup DeserializeDeviceRe
                     {
                         continue;
                     }
-                    List<DeviceRegistryNamespaceAssetStatusEvent> array = new List<DeviceRegistryNamespaceAssetStatusEvent>();
+                    List<NamespaceAssetStatusEvent> array = new List<NamespaceAssetStatusEvent>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(DeviceRegistryNamespaceAssetStatusEvent.DeserializeDeviceRegistryNamespaceAssetStatusEvent(item, options));
+                        array.Add(NamespaceAssetStatusEvent.DeserializeNamespaceAssetStatusEvent(item, options));
                     }
                     events = array;
                     continue;
@@ -117,38 +117,38 @@ internal static DeviceRegistryNamespaceAssetStatusEventGroup DeserializeDeviceRe
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceAssetStatusEventGroup(name, events ?? new ChangeTrackingList<DeviceRegistryNamespaceAssetStatusEvent>(), serializedAdditionalRawData);
+            return new NamespaceAssetStatusEventGroup(name, events ?? new ChangeTrackingList<NamespaceAssetStatusEvent>(), serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceAssetStatusEventGroup>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceAssetStatusEventGroup>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusEventGroup>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusEventGroup>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusEventGroup)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetStatusEventGroup)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceAssetStatusEventGroup IPersistableModel<DeviceRegistryNamespaceAssetStatusEventGroup>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceAssetStatusEventGroup IPersistableModel<NamespaceAssetStatusEventGroup>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusEventGroup>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusEventGroup>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceAssetStatusEventGroup(document.RootElement, options);
+                        return DeserializeNamespaceAssetStatusEventGroup(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusEventGroup)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetStatusEventGroup)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceAssetStatusEventGroup>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceAssetStatusEventGroup>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusEventGroup.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusEventGroup.cs
similarity index 75%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusEventGroup.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusEventGroup.cs
index 9c403a43d9e6..e9b8aee24160 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusEventGroup.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusEventGroup.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> Defines the asset status event group properties. </summary>
-    public partial class DeviceRegistryNamespaceAssetStatusEventGroup
+    public partial class NamespaceAssetStatusEventGroup
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,33 +45,33 @@ public partial class DeviceRegistryNamespaceAssetStatusEventGroup
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusEventGroup"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusEventGroup"/>. </summary>
         /// <param name="name"> The name of the event group. Must be unique within the status.eventGroups array. This name is used to correlate between the spec and status event group information. </param>
-        internal DeviceRegistryNamespaceAssetStatusEventGroup(string name)
+        internal NamespaceAssetStatusEventGroup(string name)
         {
             Name = name;
-            Events = new ChangeTrackingList<DeviceRegistryNamespaceAssetStatusEvent>();
+            Events = new ChangeTrackingList<NamespaceAssetStatusEvent>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusEventGroup"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusEventGroup"/>. </summary>
         /// <param name="name"> The name of the event group. Must be unique within the status.eventGroups array. This name is used to correlate between the spec and status event group information. </param>
         /// <param name="events"> Array of event statuses that describe the status of each event in the event group. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceAssetStatusEventGroup(string name, IReadOnlyList<DeviceRegistryNamespaceAssetStatusEvent> events, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceAssetStatusEventGroup(string name, IReadOnlyList<NamespaceAssetStatusEvent> events, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Name = name;
             Events = events;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusEventGroup"/> for deserialization. </summary>
-        internal DeviceRegistryNamespaceAssetStatusEventGroup()
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusEventGroup"/> for deserialization. </summary>
+        internal NamespaceAssetStatusEventGroup()
         {
         }
 
         /// <summary> The name of the event group. Must be unique within the status.eventGroups array. This name is used to correlate between the spec and status event group information. </summary>
         public string Name { get; }
         /// <summary> Array of event statuses that describe the status of each event in the event group. </summary>
-        public IReadOnlyList<DeviceRegistryNamespaceAssetStatusEvent> Events { get; }
+        public IReadOnlyList<NamespaceAssetStatusEvent> Events { get; }
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusManagementAction.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusManagementAction.Serialization.cs
similarity index 60%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusManagementAction.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusManagementAction.Serialization.cs
index 9c94914261d2..5b79165365e5 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusManagementAction.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusManagementAction.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceAssetStatusManagementAction : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceAssetStatusManagementAction>
+    public partial class NamespaceAssetStatusManagementAction : IUtf8JsonSerializable, IJsonModel<NamespaceAssetStatusManagementAction>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceAssetStatusManagementAction>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceAssetStatusManagementAction>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceAssetStatusManagementAction>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceAssetStatusManagementAction>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceAssetStatusManagementAction>.Write(Utf8Js
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusManagementAction>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusManagementAction>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusManagementAction)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetStatusManagementAction)} does not support writing '{format}' format.");
             }
 
             if (options.Format != "W")
@@ -71,19 +71,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceAssetStatusManagementAction IJsonModel<DeviceRegistryNamespaceAssetStatusManagementAction>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceAssetStatusManagementAction IJsonModel<NamespaceAssetStatusManagementAction>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusManagementAction>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusManagementAction>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusManagementAction)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetStatusManagementAction)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceAssetStatusManagementAction(document.RootElement, options);
+            return DeserializeNamespaceAssetStatusManagementAction(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceAssetStatusManagementAction DeserializeDeviceRegistryNamespaceAssetStatusManagementAction(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceAssetStatusManagementAction DeserializeNamespaceAssetStatusManagementAction(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -92,9 +92,9 @@ internal static DeviceRegistryNamespaceAssetStatusManagementAction DeserializeDe
                 return null;
             }
             string name = default;
-            DeviceRegistryNamespaceMessageSchemaReference requestMessageSchemaReference = default;
-            DeviceRegistryNamespaceMessageSchemaReference responseMessageSchemaReference = default;
-            DeviceRegistryStatusError error = default;
+            NamespaceMessageSchemaReference requestMessageSchemaReference = default;
+            NamespaceMessageSchemaReference responseMessageSchemaReference = default;
+            StatusError error = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -110,7 +110,7 @@ internal static DeviceRegistryNamespaceAssetStatusManagementAction DeserializeDe
                     {
                         continue;
                     }
-                    requestMessageSchemaReference = DeviceRegistryNamespaceMessageSchemaReference.DeserializeDeviceRegistryNamespaceMessageSchemaReference(property.Value, options);
+                    requestMessageSchemaReference = NamespaceMessageSchemaReference.DeserializeNamespaceMessageSchemaReference(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("responseMessageSchemaReference"u8))
@@ -119,7 +119,7 @@ internal static DeviceRegistryNamespaceAssetStatusManagementAction DeserializeDe
                     {
                         continue;
                     }
-                    responseMessageSchemaReference = DeviceRegistryNamespaceMessageSchemaReference.DeserializeDeviceRegistryNamespaceMessageSchemaReference(property.Value, options);
+                    responseMessageSchemaReference = NamespaceMessageSchemaReference.DeserializeNamespaceMessageSchemaReference(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("error"u8))
@@ -128,7 +128,7 @@ internal static DeviceRegistryNamespaceAssetStatusManagementAction DeserializeDe
                     {
                         continue;
                     }
-                    error = DeviceRegistryStatusError.DeserializeDeviceRegistryStatusError(property.Value, options);
+                    error = StatusError.DeserializeStatusError(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
@@ -137,38 +137,38 @@ internal static DeviceRegistryNamespaceAssetStatusManagementAction DeserializeDe
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceAssetStatusManagementAction(name, requestMessageSchemaReference, responseMessageSchemaReference, error, serializedAdditionalRawData);
+            return new NamespaceAssetStatusManagementAction(name, requestMessageSchemaReference, responseMessageSchemaReference, error, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceAssetStatusManagementAction>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceAssetStatusManagementAction>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusManagementAction>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusManagementAction>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusManagementAction)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetStatusManagementAction)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceAssetStatusManagementAction IPersistableModel<DeviceRegistryNamespaceAssetStatusManagementAction>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceAssetStatusManagementAction IPersistableModel<NamespaceAssetStatusManagementAction>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusManagementAction>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusManagementAction>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceAssetStatusManagementAction(document.RootElement, options);
+                        return DeserializeNamespaceAssetStatusManagementAction(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusManagementAction)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetStatusManagementAction)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceAssetStatusManagementAction>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceAssetStatusManagementAction>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusManagementAction.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusManagementAction.cs
similarity index 73%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusManagementAction.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusManagementAction.cs
index b7d14b6e80f6..f63cd832786b 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusManagementAction.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusManagementAction.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> Defines the asset status action properties. </summary>
-    public partial class DeviceRegistryNamespaceAssetStatusManagementAction
+    public partial class NamespaceAssetStatusManagementAction
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,20 +45,20 @@ public partial class DeviceRegistryNamespaceAssetStatusManagementAction
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusManagementAction"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusManagementAction"/>. </summary>
         /// <param name="name"> The name of the action. Must be unique within the status.actions array. This name is used to correlate between the spec and status event information. </param>
-        internal DeviceRegistryNamespaceAssetStatusManagementAction(string name)
+        internal NamespaceAssetStatusManagementAction(string name)
         {
             Name = name;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusManagementAction"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusManagementAction"/>. </summary>
         /// <param name="name"> The name of the action. Must be unique within the status.actions array. This name is used to correlate between the spec and status event information. </param>
         /// <param name="requestMessageSchemaReference"> The request message schema reference object for the action. </param>
         /// <param name="responseMessageSchemaReference"> The response message schema reference object for the action. </param>
         /// <param name="error"> Object to transfer and persist errors that originate from the edge. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceAssetStatusManagementAction(string name, DeviceRegistryNamespaceMessageSchemaReference requestMessageSchemaReference, DeviceRegistryNamespaceMessageSchemaReference responseMessageSchemaReference, DeviceRegistryStatusError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceAssetStatusManagementAction(string name, NamespaceMessageSchemaReference requestMessageSchemaReference, NamespaceMessageSchemaReference responseMessageSchemaReference, StatusError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Name = name;
             RequestMessageSchemaReference = requestMessageSchemaReference;
@@ -67,18 +67,18 @@ internal DeviceRegistryNamespaceAssetStatusManagementAction(string name, DeviceR
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusManagementAction"/> for deserialization. </summary>
-        internal DeviceRegistryNamespaceAssetStatusManagementAction()
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusManagementAction"/> for deserialization. </summary>
+        internal NamespaceAssetStatusManagementAction()
         {
         }
 
         /// <summary> The name of the action. Must be unique within the status.actions array. This name is used to correlate between the spec and status event information. </summary>
         public string Name { get; }
         /// <summary> The request message schema reference object for the action. </summary>
-        public DeviceRegistryNamespaceMessageSchemaReference RequestMessageSchemaReference { get; }
+        public NamespaceMessageSchemaReference RequestMessageSchemaReference { get; }
         /// <summary> The response message schema reference object for the action. </summary>
-        public DeviceRegistryNamespaceMessageSchemaReference ResponseMessageSchemaReference { get; }
+        public NamespaceMessageSchemaReference ResponseMessageSchemaReference { get; }
         /// <summary> Object to transfer and persist errors that originate from the edge. </summary>
-        public DeviceRegistryStatusError Error { get; }
+        public StatusError Error { get; }
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusManagementGroup.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusManagementGroup.Serialization.cs
similarity index 59%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusManagementGroup.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusManagementGroup.Serialization.cs
index e3b3f63a0460..7fa85141d409 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusManagementGroup.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusManagementGroup.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceAssetStatusManagementGroup : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceAssetStatusManagementGroup>
+    public partial class NamespaceAssetStatusManagementGroup : IUtf8JsonSerializable, IJsonModel<NamespaceAssetStatusManagementGroup>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceAssetStatusManagementGroup>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceAssetStatusManagementGroup>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceAssetStatusManagementGroup>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceAssetStatusManagementGroup>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceAssetStatusManagementGroup>.Write(Utf8Jso
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusManagementGroup>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusManagementGroup>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusManagementGroup)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetStatusManagementGroup)} does not support writing '{format}' format.");
             }
 
             if (options.Format != "W")
@@ -66,19 +66,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceAssetStatusManagementGroup IJsonModel<DeviceRegistryNamespaceAssetStatusManagementGroup>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceAssetStatusManagementGroup IJsonModel<NamespaceAssetStatusManagementGroup>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusManagementGroup>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusManagementGroup>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusManagementGroup)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetStatusManagementGroup)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceAssetStatusManagementGroup(document.RootElement, options);
+            return DeserializeNamespaceAssetStatusManagementGroup(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceAssetStatusManagementGroup DeserializeDeviceRegistryNamespaceAssetStatusManagementGroup(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceAssetStatusManagementGroup DeserializeNamespaceAssetStatusManagementGroup(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -87,7 +87,7 @@ internal static DeviceRegistryNamespaceAssetStatusManagementGroup DeserializeDev
                 return null;
             }
             string name = default;
-            IReadOnlyList<DeviceRegistryNamespaceAssetStatusManagementAction> actions = default;
+            IReadOnlyList<NamespaceAssetStatusManagementAction> actions = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -103,10 +103,10 @@ internal static DeviceRegistryNamespaceAssetStatusManagementGroup DeserializeDev
                     {
                         continue;
                     }
-                    List<DeviceRegistryNamespaceAssetStatusManagementAction> array = new List<DeviceRegistryNamespaceAssetStatusManagementAction>();
+                    List<NamespaceAssetStatusManagementAction> array = new List<NamespaceAssetStatusManagementAction>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(DeviceRegistryNamespaceAssetStatusManagementAction.DeserializeDeviceRegistryNamespaceAssetStatusManagementAction(item, options));
+                        array.Add(NamespaceAssetStatusManagementAction.DeserializeNamespaceAssetStatusManagementAction(item, options));
                     }
                     actions = array;
                     continue;
@@ -117,38 +117,38 @@ internal static DeviceRegistryNamespaceAssetStatusManagementGroup DeserializeDev
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceAssetStatusManagementGroup(name, actions ?? new ChangeTrackingList<DeviceRegistryNamespaceAssetStatusManagementAction>(), serializedAdditionalRawData);
+            return new NamespaceAssetStatusManagementGroup(name, actions ?? new ChangeTrackingList<NamespaceAssetStatusManagementAction>(), serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceAssetStatusManagementGroup>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceAssetStatusManagementGroup>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusManagementGroup>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusManagementGroup>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusManagementGroup)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetStatusManagementGroup)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceAssetStatusManagementGroup IPersistableModel<DeviceRegistryNamespaceAssetStatusManagementGroup>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceAssetStatusManagementGroup IPersistableModel<NamespaceAssetStatusManagementGroup>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusManagementGroup>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusManagementGroup>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceAssetStatusManagementGroup(document.RootElement, options);
+                        return DeserializeNamespaceAssetStatusManagementGroup(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusManagementGroup)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetStatusManagementGroup)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceAssetStatusManagementGroup>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceAssetStatusManagementGroup>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusManagementGroup.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusManagementGroup.cs
similarity index 73%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusManagementGroup.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusManagementGroup.cs
index b4157f0b37bc..e252a8274d85 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusManagementGroup.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusManagementGroup.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> Defines the asset status management group properties. </summary>
-    public partial class DeviceRegistryNamespaceAssetStatusManagementGroup
+    public partial class NamespaceAssetStatusManagementGroup
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,33 +45,33 @@ public partial class DeviceRegistryNamespaceAssetStatusManagementGroup
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusManagementGroup"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusManagementGroup"/>. </summary>
         /// <param name="name"> The name of the management group. Must be unique within the status.managementGroups array. This name is used to correlate between the spec and status event information. </param>
-        internal DeviceRegistryNamespaceAssetStatusManagementGroup(string name)
+        internal NamespaceAssetStatusManagementGroup(string name)
         {
             Name = name;
-            Actions = new ChangeTrackingList<DeviceRegistryNamespaceAssetStatusManagementAction>();
+            Actions = new ChangeTrackingList<NamespaceAssetStatusManagementAction>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusManagementGroup"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusManagementGroup"/>. </summary>
         /// <param name="name"> The name of the management group. Must be unique within the status.managementGroups array. This name is used to correlate between the spec and status event information. </param>
         /// <param name="actions"> Array of action statuses that describe the status of each action. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceAssetStatusManagementGroup(string name, IReadOnlyList<DeviceRegistryNamespaceAssetStatusManagementAction> actions, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceAssetStatusManagementGroup(string name, IReadOnlyList<NamespaceAssetStatusManagementAction> actions, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Name = name;
             Actions = actions;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusManagementGroup"/> for deserialization. </summary>
-        internal DeviceRegistryNamespaceAssetStatusManagementGroup()
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusManagementGroup"/> for deserialization. </summary>
+        internal NamespaceAssetStatusManagementGroup()
         {
         }
 
         /// <summary> The name of the management group. Must be unique within the status.managementGroups array. This name is used to correlate between the spec and status event information. </summary>
         public string Name { get; }
         /// <summary> Array of action statuses that describe the status of each action. </summary>
-        public IReadOnlyList<DeviceRegistryNamespaceAssetStatusManagementAction> Actions { get; }
+        public IReadOnlyList<NamespaceAssetStatusManagementAction> Actions { get; }
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusDataset.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusStream.Serialization.cs
similarity index 61%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusDataset.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusStream.Serialization.cs
index 8973d68d3b76..8ae5a5ad1fe3 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusDataset.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusStream.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceAssetStatusDataset : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceAssetStatusDataset>
+    public partial class NamespaceAssetStatusStream : IUtf8JsonSerializable, IJsonModel<NamespaceAssetStatusStream>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceAssetStatusDataset>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceAssetStatusStream>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceAssetStatusDataset>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceAssetStatusStream>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceAssetStatusDataset>.Write(Utf8JsonWriter
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusDataset>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusStream>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusDataset)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetStatusStream)} does not support writing '{format}' format.");
             }
 
             if (options.Format != "W")
@@ -66,19 +66,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceAssetStatusDataset IJsonModel<DeviceRegistryNamespaceAssetStatusDataset>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceAssetStatusStream IJsonModel<NamespaceAssetStatusStream>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusDataset>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusStream>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusDataset)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetStatusStream)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceAssetStatusDataset(document.RootElement, options);
+            return DeserializeNamespaceAssetStatusStream(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceAssetStatusDataset DeserializeDeviceRegistryNamespaceAssetStatusDataset(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceAssetStatusStream DeserializeNamespaceAssetStatusStream(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -87,8 +87,8 @@ internal static DeviceRegistryNamespaceAssetStatusDataset DeserializeDeviceRegis
                 return null;
             }
             string name = default;
-            DeviceRegistryNamespaceMessageSchemaReference messageSchemaReference = default;
-            DeviceRegistryStatusError error = default;
+            NamespaceMessageSchemaReference messageSchemaReference = default;
+            StatusError error = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -104,7 +104,7 @@ internal static DeviceRegistryNamespaceAssetStatusDataset DeserializeDeviceRegis
                     {
                         continue;
                     }
-                    messageSchemaReference = DeviceRegistryNamespaceMessageSchemaReference.DeserializeDeviceRegistryNamespaceMessageSchemaReference(property.Value, options);
+                    messageSchemaReference = NamespaceMessageSchemaReference.DeserializeNamespaceMessageSchemaReference(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("error"u8))
@@ -113,7 +113,7 @@ internal static DeviceRegistryNamespaceAssetStatusDataset DeserializeDeviceRegis
                     {
                         continue;
                     }
-                    error = DeviceRegistryStatusError.DeserializeDeviceRegistryStatusError(property.Value, options);
+                    error = StatusError.DeserializeStatusError(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
@@ -122,38 +122,38 @@ internal static DeviceRegistryNamespaceAssetStatusDataset DeserializeDeviceRegis
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceAssetStatusDataset(name, messageSchemaReference, error, serializedAdditionalRawData);
+            return new NamespaceAssetStatusStream(name, messageSchemaReference, error, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceAssetStatusDataset>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceAssetStatusStream>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusDataset>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusStream>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusDataset)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetStatusStream)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceAssetStatusDataset IPersistableModel<DeviceRegistryNamespaceAssetStatusDataset>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceAssetStatusStream IPersistableModel<NamespaceAssetStatusStream>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetStatusDataset>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetStatusStream>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceAssetStatusDataset(document.RootElement, options);
+                        return DeserializeNamespaceAssetStatusStream(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetStatusDataset)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetStatusStream)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceAssetStatusDataset>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceAssetStatusStream>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusStream.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusStream.cs
similarity index 76%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusStream.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusStream.cs
index 827e56f05512..ef6da3b5f421 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceAssetStatusStream.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceAssetStatusStream.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> Defines the asset status stream properties. </summary>
-    public partial class DeviceRegistryNamespaceAssetStatusStream
+    public partial class NamespaceAssetStatusStream
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,19 +45,19 @@ public partial class DeviceRegistryNamespaceAssetStatusStream
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusStream"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusStream"/>. </summary>
         /// <param name="name"> The name of the stream. Must be unique within the status.streams array. This name is used to correlate between the spec and status event information. </param>
-        internal DeviceRegistryNamespaceAssetStatusStream(string name)
+        internal NamespaceAssetStatusStream(string name)
         {
             Name = name;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusStream"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusStream"/>. </summary>
         /// <param name="name"> The name of the stream. Must be unique within the status.streams array. This name is used to correlate between the spec and status event information. </param>
         /// <param name="messageSchemaReference"> The message schema reference object. </param>
         /// <param name="error"> Object to transfer and persist errors that originate from the edge. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceAssetStatusStream(string name, DeviceRegistryNamespaceMessageSchemaReference messageSchemaReference, DeviceRegistryStatusError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceAssetStatusStream(string name, NamespaceMessageSchemaReference messageSchemaReference, StatusError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Name = name;
             MessageSchemaReference = messageSchemaReference;
@@ -65,16 +65,16 @@ internal DeviceRegistryNamespaceAssetStatusStream(string name, DeviceRegistryNam
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetStatusStream"/> for deserialization. </summary>
-        internal DeviceRegistryNamespaceAssetStatusStream()
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetStatusStream"/> for deserialization. </summary>
+        internal NamespaceAssetStatusStream()
         {
         }
 
         /// <summary> The name of the stream. Must be unique within the status.streams array. This name is used to correlate between the spec and status event information. </summary>
         public string Name { get; }
         /// <summary> The message schema reference object. </summary>
-        public DeviceRegistryNamespaceMessageSchemaReference MessageSchemaReference { get; }
+        public NamespaceMessageSchemaReference MessageSchemaReference { get; }
         /// <summary> Object to transfer and persist errors that originate from the edge. </summary>
-        public DeviceRegistryStatusError Error { get; }
+        public StatusError Error { get; }
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDeviceListResult.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDeviceListResult.Serialization.cs
index 8a4698b874c2..876eb9d935e5 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDeviceListResult.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDeviceListResult.Serialization.cs
@@ -83,7 +83,7 @@ internal static NamespaceDeviceListResult DeserializeNamespaceDeviceListResult(J
             {
                 return null;
             }
-            IReadOnlyList<DeviceRegistryNamespaceDeviceData> value = default;
+            IReadOnlyList<NamespaceDeviceData> value = default;
             Uri nextLink = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -91,10 +91,10 @@ internal static NamespaceDeviceListResult DeserializeNamespaceDeviceListResult(J
             {
                 if (property.NameEquals("value"u8))
                 {
-                    List<DeviceRegistryNamespaceDeviceData> array = new List<DeviceRegistryNamespaceDeviceData>();
+                    List<NamespaceDeviceData> array = new List<NamespaceDeviceData>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(DeviceRegistryNamespaceDeviceData.DeserializeDeviceRegistryNamespaceDeviceData(item, options));
+                        array.Add(NamespaceDeviceData.DeserializeNamespaceDeviceData(item, options));
                     }
                     value = array;
                     continue;
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDeviceListResult.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDeviceListResult.cs
index a42bcea46164..99e7f17f98fb 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDeviceListResult.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDeviceListResult.cs
@@ -49,7 +49,7 @@ internal partial class NamespaceDeviceListResult
         /// <summary> Initializes a new instance of <see cref="NamespaceDeviceListResult"/>. </summary>
         /// <param name="value"> The NamespaceDevice items on this page. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        internal NamespaceDeviceListResult(IEnumerable<DeviceRegistryNamespaceDeviceData> value)
+        internal NamespaceDeviceListResult(IEnumerable<NamespaceDeviceData> value)
         {
             Argument.AssertNotNull(value, nameof(value));
 
@@ -60,7 +60,7 @@ internal NamespaceDeviceListResult(IEnumerable<DeviceRegistryNamespaceDeviceData
         /// <param name="value"> The NamespaceDevice items on this page. </param>
         /// <param name="nextLink"> The link to the next page of items. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal NamespaceDeviceListResult(IReadOnlyList<DeviceRegistryNamespaceDeviceData> value, Uri nextLink, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceDeviceListResult(IReadOnlyList<NamespaceDeviceData> value, Uri nextLink, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Value = value;
             NextLink = nextLink;
@@ -73,7 +73,7 @@ internal NamespaceDeviceListResult()
         }
 
         /// <summary> The NamespaceDevice items on this page. </summary>
-        public IReadOnlyList<DeviceRegistryNamespaceDeviceData> Value { get; }
+        public IReadOnlyList<NamespaceDeviceData> Value { get; }
         /// <summary> The link to the next page of items. </summary>
         public Uri NextLink { get; }
     }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDevicePatch.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDevicePatch.Serialization.cs
similarity index 68%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDevicePatch.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDevicePatch.Serialization.cs
index f356efe00f98..820e4f7554b7 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDevicePatch.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDevicePatch.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceDevicePatch : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceDevicePatch>
+    public partial class NamespaceDevicePatch : IUtf8JsonSerializable, IJsonModel<NamespaceDevicePatch>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceDevicePatch>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceDevicePatch>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceDevicePatch>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceDevicePatch>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceDevicePatch>.Write(Utf8JsonWriter writer,
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDevicePatch)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDevicePatch)} does not support writing '{format}' format.");
             }
 
             if (Optional.IsCollectionDefined(Tags))
@@ -67,19 +67,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceDevicePatch IJsonModel<DeviceRegistryNamespaceDevicePatch>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceDevicePatch IJsonModel<NamespaceDevicePatch>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDevicePatch)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDevicePatch)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceDevicePatch(document.RootElement, options);
+            return DeserializeNamespaceDevicePatch(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceDevicePatch DeserializeDeviceRegistryNamespaceDevicePatch(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceDevicePatch DeserializeNamespaceDevicePatch(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -122,38 +122,38 @@ internal static DeviceRegistryNamespaceDevicePatch DeserializeDeviceRegistryName
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceDevicePatch(tags ?? new ChangeTrackingDictionary<string, string>(), properties, serializedAdditionalRawData);
+            return new NamespaceDevicePatch(tags ?? new ChangeTrackingDictionary<string, string>(), properties, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceDevicePatch>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceDevicePatch>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDevicePatch)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDevicePatch)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceDevicePatch IPersistableModel<DeviceRegistryNamespaceDevicePatch>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceDevicePatch IPersistableModel<NamespaceDevicePatch>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceDevicePatch(document.RootElement, options);
+                        return DeserializeNamespaceDevicePatch(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDevicePatch)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDevicePatch)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceDevicePatch>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceDevicePatch>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDevicePatch.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDevicePatch.cs
similarity index 82%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDevicePatch.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDevicePatch.cs
index fdb96dfe09f1..eb7d314995ee 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDevicePatch.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDevicePatch.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> The type used for update operations of the NamespaceDevice. </summary>
-    public partial class DeviceRegistryNamespaceDevicePatch
+    public partial class NamespaceDevicePatch
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,17 +45,17 @@ public partial class DeviceRegistryNamespaceDevicePatch
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDevicePatch"/>. </summary>
-        public DeviceRegistryNamespaceDevicePatch()
+        /// <summary> Initializes a new instance of <see cref="NamespaceDevicePatch"/>. </summary>
+        public NamespaceDevicePatch()
         {
             Tags = new ChangeTrackingDictionary<string, string>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDevicePatch"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceDevicePatch"/>. </summary>
         /// <param name="tags"> Resource tags. </param>
         /// <param name="properties"> The resource-specific properties for this resource. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceDevicePatch(IDictionary<string, string> tags, NamespaceDeviceUpdateProperties properties, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceDevicePatch(IDictionary<string, string> tags, NamespaceDeviceUpdateProperties properties, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Tags = tags;
             Properties = properties;
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDeviceProperties.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDeviceProperties.Serialization.cs
similarity index 84%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDeviceProperties.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDeviceProperties.Serialization.cs
index 489006da15b8..7bfe6c524a11 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDeviceProperties.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDeviceProperties.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceDeviceProperties : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceDeviceProperties>
+    public partial class NamespaceDeviceProperties : IUtf8JsonSerializable, IJsonModel<NamespaceDeviceProperties>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceDeviceProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceDeviceProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceDeviceProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceDeviceProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceDeviceProperties>.Write(Utf8JsonWriter wr
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDeviceProperties)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDeviceProperties)} does not support writing '{format}' format.");
             }
 
             if (options.Format != "W" && Optional.IsDefined(Uuid))
@@ -139,19 +139,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceDeviceProperties IJsonModel<DeviceRegistryNamespaceDeviceProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceDeviceProperties IJsonModel<NamespaceDeviceProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDeviceProperties)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDeviceProperties)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceDeviceProperties(document.RootElement, options);
+            return DeserializeNamespaceDeviceProperties(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceDeviceProperties DeserializeDeviceRegistryNamespaceDeviceProperties(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceDeviceProperties DeserializeNamespaceDeviceProperties(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -293,7 +293,7 @@ internal static DeviceRegistryNamespaceDeviceProperties DeserializeDeviceRegistr
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceDeviceProperties(
+            return new NamespaceDeviceProperties(
                 uuid,
                 enabled,
                 externalDeviceId,
@@ -311,35 +311,35 @@ internal static DeviceRegistryNamespaceDeviceProperties DeserializeDeviceRegistr
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceDeviceProperties>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceDeviceProperties>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDeviceProperties)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDeviceProperties)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceDeviceProperties IPersistableModel<DeviceRegistryNamespaceDeviceProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceDeviceProperties IPersistableModel<NamespaceDeviceProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceDeviceProperties(document.RootElement, options);
+                        return DeserializeNamespaceDeviceProperties(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDeviceProperties)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDeviceProperties)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceDeviceProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceDeviceProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDeviceProperties.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDeviceProperties.cs
similarity index 89%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDeviceProperties.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDeviceProperties.cs
index 59b2281d1799..a5ef4c627fb3 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDeviceProperties.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDeviceProperties.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> Defines the device properties. </summary>
-    public partial class DeviceRegistryNamespaceDeviceProperties
+    public partial class NamespaceDeviceProperties
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,13 +45,13 @@ public partial class DeviceRegistryNamespaceDeviceProperties
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDeviceProperties"/>. </summary>
-        public DeviceRegistryNamespaceDeviceProperties()
+        /// <summary> Initializes a new instance of <see cref="NamespaceDeviceProperties"/>. </summary>
+        public NamespaceDeviceProperties()
         {
             Attributes = new ChangeTrackingDictionary<string, BinaryData>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDeviceProperties"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceDeviceProperties"/>. </summary>
         /// <param name="uuid"> A unique identifier for the device. </param>
         /// <param name="enabled"> Indicates if the resource is enabled or not. </param>
         /// <param name="externalDeviceId"> The Device ID provided by the customer. </param>
@@ -67,7 +67,7 @@ public DeviceRegistryNamespaceDeviceProperties()
         /// <param name="lastTransitionOn"> A timestamp (in UTC) that is updated each time the resource is modified. </param>
         /// <param name="provisioningState"> Provisioning state of the resource. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceDeviceProperties(string uuid, bool? enabled, string externalDeviceId, string discoveredDeviceRef, string manufacturer, string model, string operatingSystem, string operatingSystemVersion, MessagingEndpoints endpoints, IDictionary<string, BinaryData> attributes, DeviceStatus status, long? version, DateTimeOffset? lastTransitionOn, DeviceRegistryProvisioningState? provisioningState, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceDeviceProperties(string uuid, bool? enabled, string externalDeviceId, string discoveredDeviceRef, string manufacturer, string model, string operatingSystem, string operatingSystemVersion, MessagingEndpoints endpoints, IDictionary<string, BinaryData> attributes, DeviceStatus status, long? version, DateTimeOffset? lastTransitionOn, DeviceRegistryProvisioningState? provisioningState, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Uuid = uuid;
             Enabled = enabled;
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetListResult.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetListResult.Serialization.cs
index a5974b4ea909..a9edb8502b79 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetListResult.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetListResult.Serialization.cs
@@ -83,7 +83,7 @@ internal static NamespaceDiscoveredAssetListResult DeserializeNamespaceDiscovere
             {
                 return null;
             }
-            IReadOnlyList<DeviceRegistryNamespaceDiscoveredAssetData> value = default;
+            IReadOnlyList<NamespaceDiscoveredAssetData> value = default;
             Uri nextLink = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -91,10 +91,10 @@ internal static NamespaceDiscoveredAssetListResult DeserializeNamespaceDiscovere
             {
                 if (property.NameEquals("value"u8))
                 {
-                    List<DeviceRegistryNamespaceDiscoveredAssetData> array = new List<DeviceRegistryNamespaceDiscoveredAssetData>();
+                    List<NamespaceDiscoveredAssetData> array = new List<NamespaceDiscoveredAssetData>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(DeviceRegistryNamespaceDiscoveredAssetData.DeserializeDeviceRegistryNamespaceDiscoveredAssetData(item, options));
+                        array.Add(NamespaceDiscoveredAssetData.DeserializeNamespaceDiscoveredAssetData(item, options));
                     }
                     value = array;
                     continue;
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetListResult.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetListResult.cs
index 0210282daca5..fad7014e5959 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetListResult.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetListResult.cs
@@ -49,7 +49,7 @@ internal partial class NamespaceDiscoveredAssetListResult
         /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredAssetListResult"/>. </summary>
         /// <param name="value"> The NamespaceDiscoveredAsset items on this page. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        internal NamespaceDiscoveredAssetListResult(IEnumerable<DeviceRegistryNamespaceDiscoveredAssetData> value)
+        internal NamespaceDiscoveredAssetListResult(IEnumerable<NamespaceDiscoveredAssetData> value)
         {
             Argument.AssertNotNull(value, nameof(value));
 
@@ -60,7 +60,7 @@ internal NamespaceDiscoveredAssetListResult(IEnumerable<DeviceRegistryNamespaceD
         /// <param name="value"> The NamespaceDiscoveredAsset items on this page. </param>
         /// <param name="nextLink"> The link to the next page of items. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal NamespaceDiscoveredAssetListResult(IReadOnlyList<DeviceRegistryNamespaceDiscoveredAssetData> value, Uri nextLink, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceDiscoveredAssetListResult(IReadOnlyList<NamespaceDiscoveredAssetData> value, Uri nextLink, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Value = value;
             NextLink = nextLink;
@@ -73,7 +73,7 @@ internal NamespaceDiscoveredAssetListResult()
         }
 
         /// <summary> The NamespaceDiscoveredAsset items on this page. </summary>
-        public IReadOnlyList<DeviceRegistryNamespaceDiscoveredAssetData> Value { get; }
+        public IReadOnlyList<NamespaceDiscoveredAssetData> Value { get; }
         /// <summary> The link to the next page of items. </summary>
         public Uri NextLink { get; }
     }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredAssetPatch.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetPatch.Serialization.cs
similarity index 66%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredAssetPatch.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetPatch.Serialization.cs
index 778d3fd791c6..36ae23fd8bbe 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredAssetPatch.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetPatch.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceDiscoveredAssetPatch : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceDiscoveredAssetPatch>
+    public partial class NamespaceDiscoveredAssetPatch : IUtf8JsonSerializable, IJsonModel<NamespaceDiscoveredAssetPatch>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceDiscoveredAssetPatch>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceDiscoveredAssetPatch>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceDiscoveredAssetPatch>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceDiscoveredAssetPatch>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceDiscoveredAssetPatch>.Write(Utf8JsonWrite
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredAssetPatch)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDiscoveredAssetPatch)} does not support writing '{format}' format.");
             }
 
             if (Optional.IsCollectionDefined(Tags))
@@ -67,19 +67,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceDiscoveredAssetPatch IJsonModel<DeviceRegistryNamespaceDiscoveredAssetPatch>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceDiscoveredAssetPatch IJsonModel<NamespaceDiscoveredAssetPatch>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredAssetPatch)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDiscoveredAssetPatch)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceDiscoveredAssetPatch(document.RootElement, options);
+            return DeserializeNamespaceDiscoveredAssetPatch(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceDiscoveredAssetPatch DeserializeDeviceRegistryNamespaceDiscoveredAssetPatch(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceDiscoveredAssetPatch DeserializeNamespaceDiscoveredAssetPatch(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -122,38 +122,38 @@ internal static DeviceRegistryNamespaceDiscoveredAssetPatch DeserializeDeviceReg
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceDiscoveredAssetPatch(tags ?? new ChangeTrackingDictionary<string, string>(), properties, serializedAdditionalRawData);
+            return new NamespaceDiscoveredAssetPatch(tags ?? new ChangeTrackingDictionary<string, string>(), properties, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetPatch>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceDiscoveredAssetPatch>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredAssetPatch)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDiscoveredAssetPatch)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceDiscoveredAssetPatch IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetPatch>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceDiscoveredAssetPatch IPersistableModel<NamespaceDiscoveredAssetPatch>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredAssetPatch>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceDiscoveredAssetPatch(document.RootElement, options);
+                        return DeserializeNamespaceDiscoveredAssetPatch(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredAssetPatch)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDiscoveredAssetPatch)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetPatch>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceDiscoveredAssetPatch>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredAssetPatch.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetPatch.cs
similarity index 81%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredAssetPatch.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetPatch.cs
index 4a7bc6864629..c394af6542f6 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredAssetPatch.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetPatch.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> The type used for update operations of the NamespaceDiscoveredAsset. </summary>
-    public partial class DeviceRegistryNamespaceDiscoveredAssetPatch
+    public partial class NamespaceDiscoveredAssetPatch
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,17 +45,17 @@ public partial class DeviceRegistryNamespaceDiscoveredAssetPatch
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredAssetPatch"/>. </summary>
-        public DeviceRegistryNamespaceDiscoveredAssetPatch()
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredAssetPatch"/>. </summary>
+        public NamespaceDiscoveredAssetPatch()
         {
             Tags = new ChangeTrackingDictionary<string, string>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredAssetPatch"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredAssetPatch"/>. </summary>
         /// <param name="tags"> Resource tags. </param>
         /// <param name="properties"> The resource-specific properties for this resource. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceDiscoveredAssetPatch(IDictionary<string, string> tags, NamespaceDiscoveredAssetUpdateProperties properties, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceDiscoveredAssetPatch(IDictionary<string, string> tags, NamespaceDiscoveredAssetUpdateProperties properties, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Tags = tags;
             Properties = properties;
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredAssetProperties.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetProperties.Serialization.cs
similarity index 90%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredAssetProperties.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetProperties.Serialization.cs
index 58b5c6d0f078..3e433d04bd29 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredAssetProperties.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetProperties.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceDiscoveredAssetProperties : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceDiscoveredAssetProperties>
+    public partial class NamespaceDiscoveredAssetProperties : IUtf8JsonSerializable, IJsonModel<NamespaceDiscoveredAssetProperties>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceDiscoveredAssetProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceDiscoveredAssetProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceDiscoveredAssetProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceDiscoveredAssetProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceDiscoveredAssetProperties>.Write(Utf8Json
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredAssetProperties)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDiscoveredAssetProperties)} does not support writing '{format}' format.");
             }
 
             writer.WritePropertyName("deviceRef"u8);
@@ -240,19 +240,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceDiscoveredAssetProperties IJsonModel<DeviceRegistryNamespaceDiscoveredAssetProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceDiscoveredAssetProperties IJsonModel<NamespaceDiscoveredAssetProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredAssetProperties)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDiscoveredAssetProperties)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceDiscoveredAssetProperties(document.RootElement, options);
+            return DeserializeNamespaceDiscoveredAssetProperties(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceDiscoveredAssetProperties DeserializeDeviceRegistryNamespaceDiscoveredAssetProperties(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceDiscoveredAssetProperties DeserializeNamespaceDiscoveredAssetProperties(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -530,7 +530,7 @@ internal static DeviceRegistryNamespaceDiscoveredAssetProperties DeserializeDevi
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceDiscoveredAssetProperties(
+            return new NamespaceDiscoveredAssetProperties(
                 deviceRef,
                 displayName,
                 assetTypeRefs ?? new ChangeTrackingList<string>(),
@@ -562,35 +562,35 @@ internal static DeviceRegistryNamespaceDiscoveredAssetProperties DeserializeDevi
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetProperties>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceDiscoveredAssetProperties>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredAssetProperties)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDiscoveredAssetProperties)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceDiscoveredAssetProperties IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceDiscoveredAssetProperties IPersistableModel<NamespaceDiscoveredAssetProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredAssetProperties>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceDiscoveredAssetProperties(document.RootElement, options);
+                        return DeserializeNamespaceDiscoveredAssetProperties(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredAssetProperties)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDiscoveredAssetProperties)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceDiscoveredAssetProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredAssetProperties.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetProperties.cs
similarity index 90%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredAssetProperties.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetProperties.cs
index 8ac2999d8ce3..f43734e36bda 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredAssetProperties.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredAssetProperties.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> Defines the discovered asset properties. </summary>
-    public partial class DeviceRegistryNamespaceDiscoveredAssetProperties
+    public partial class NamespaceDiscoveredAssetProperties
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,12 +45,12 @@ public partial class DeviceRegistryNamespaceDiscoveredAssetProperties
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredAssetProperties"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredAssetProperties"/>. </summary>
         /// <param name="deviceRef"> Reference to the device that provides data for this asset. Must provide device name &amp; endpoint on the device to use. </param>
         /// <param name="discoveryId"> Identifier used to detect changes in the asset. </param>
         /// <param name="version"> An integer that is incremented each time the resource is modified. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="deviceRef"/> or <paramref name="discoveryId"/> is null. </exception>
-        public DeviceRegistryNamespaceDiscoveredAssetProperties(DeviceRef deviceRef, string discoveryId, long version)
+        public NamespaceDiscoveredAssetProperties(DeviceRef deviceRef, string discoveryId, long version)
         {
             Argument.AssertNotNull(deviceRef, nameof(deviceRef));
             Argument.AssertNotNull(discoveryId, nameof(discoveryId));
@@ -69,7 +69,7 @@ public DeviceRegistryNamespaceDiscoveredAssetProperties(DeviceRef deviceRef, str
             ManagementGroups = new ChangeTrackingList<NamespaceDiscoveredManagementGroup>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredAssetProperties"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredAssetProperties"/>. </summary>
         /// <param name="deviceRef"> Reference to the device that provides data for this asset. Must provide device name &amp; endpoint on the device to use. </param>
         /// <param name="displayName"> Human-readable display name. </param>
         /// <param name="assetTypeRefs"> URIs or type definition IDs. </param>
@@ -111,7 +111,7 @@ public DeviceRegistryNamespaceDiscoveredAssetProperties(DeviceRef deviceRef, str
         /// <param name="managementGroups"> Array of management groups that are part of the asset. Each management group can have a per-group configuration. </param>
         /// <param name="provisioningState"> Provisioning state of the resource. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceDiscoveredAssetProperties(DeviceRef deviceRef, string displayName, IList<string> assetTypeRefs, string description, string discoveryId, string externalAssetId, long version, string manufacturer, string manufacturerUri, string model, string productCode, string hardwareRevision, string softwareRevision, string documentationUri, string serialNumber, IDictionary<string, BinaryData> attributes, string defaultDatasetsConfiguration, string defaultEventsConfiguration, string defaultStreamsConfiguration, string defaultManagementGroupsConfiguration, IList<DatasetDestination> defaultDatasetsDestinations, IList<EventDestination> defaultEventsDestinations, IList<StreamDestination> defaultStreamsDestinations, IList<NamespaceDiscoveredDataset> datasets, IList<NamespaceDiscoveredEventGroup> eventGroups, IList<NamespaceDiscoveredStream> streams, IList<NamespaceDiscoveredManagementGroup> managementGroups, DeviceRegistryProvisioningState? provisioningState, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceDiscoveredAssetProperties(DeviceRef deviceRef, string displayName, IList<string> assetTypeRefs, string description, string discoveryId, string externalAssetId, long version, string manufacturer, string manufacturerUri, string model, string productCode, string hardwareRevision, string softwareRevision, string documentationUri, string serialNumber, IDictionary<string, BinaryData> attributes, string defaultDatasetsConfiguration, string defaultEventsConfiguration, string defaultStreamsConfiguration, string defaultManagementGroupsConfiguration, IList<DatasetDestination> defaultDatasetsDestinations, IList<EventDestination> defaultEventsDestinations, IList<StreamDestination> defaultStreamsDestinations, IList<NamespaceDiscoveredDataset> datasets, IList<NamespaceDiscoveredEventGroup> eventGroups, IList<NamespaceDiscoveredStream> streams, IList<NamespaceDiscoveredManagementGroup> managementGroups, DeviceRegistryProvisioningState? provisioningState, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             DeviceRef = deviceRef;
             DisplayName = displayName;
@@ -144,8 +144,8 @@ internal DeviceRegistryNamespaceDiscoveredAssetProperties(DeviceRef deviceRef, s
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredAssetProperties"/> for deserialization. </summary>
-        internal DeviceRegistryNamespaceDiscoveredAssetProperties()
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredAssetProperties"/> for deserialization. </summary>
+        internal NamespaceDiscoveredAssetProperties()
         {
         }
 
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDeviceListResult.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDeviceListResult.Serialization.cs
index b53f9a38a2b6..5eb93d6b9059 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDeviceListResult.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDeviceListResult.Serialization.cs
@@ -83,7 +83,7 @@ internal static NamespaceDiscoveredDeviceListResult DeserializeNamespaceDiscover
             {
                 return null;
             }
-            IReadOnlyList<DeviceRegistryNamespaceDiscoveredDeviceData> value = default;
+            IReadOnlyList<NamespaceDiscoveredDeviceData> value = default;
             Uri nextLink = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -91,10 +91,10 @@ internal static NamespaceDiscoveredDeviceListResult DeserializeNamespaceDiscover
             {
                 if (property.NameEquals("value"u8))
                 {
-                    List<DeviceRegistryNamespaceDiscoveredDeviceData> array = new List<DeviceRegistryNamespaceDiscoveredDeviceData>();
+                    List<NamespaceDiscoveredDeviceData> array = new List<NamespaceDiscoveredDeviceData>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(DeviceRegistryNamespaceDiscoveredDeviceData.DeserializeDeviceRegistryNamespaceDiscoveredDeviceData(item, options));
+                        array.Add(NamespaceDiscoveredDeviceData.DeserializeNamespaceDiscoveredDeviceData(item, options));
                     }
                     value = array;
                     continue;
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDeviceListResult.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDeviceListResult.cs
index dd4e03dde601..bc6f972b1a5e 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDeviceListResult.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDeviceListResult.cs
@@ -49,7 +49,7 @@ internal partial class NamespaceDiscoveredDeviceListResult
         /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredDeviceListResult"/>. </summary>
         /// <param name="value"> The NamespaceDiscoveredDevice items on this page. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        internal NamespaceDiscoveredDeviceListResult(IEnumerable<DeviceRegistryNamespaceDiscoveredDeviceData> value)
+        internal NamespaceDiscoveredDeviceListResult(IEnumerable<NamespaceDiscoveredDeviceData> value)
         {
             Argument.AssertNotNull(value, nameof(value));
 
@@ -60,7 +60,7 @@ internal NamespaceDiscoveredDeviceListResult(IEnumerable<DeviceRegistryNamespace
         /// <param name="value"> The NamespaceDiscoveredDevice items on this page. </param>
         /// <param name="nextLink"> The link to the next page of items. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal NamespaceDiscoveredDeviceListResult(IReadOnlyList<DeviceRegistryNamespaceDiscoveredDeviceData> value, Uri nextLink, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceDiscoveredDeviceListResult(IReadOnlyList<NamespaceDiscoveredDeviceData> value, Uri nextLink, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Value = value;
             NextLink = nextLink;
@@ -73,7 +73,7 @@ internal NamespaceDiscoveredDeviceListResult()
         }
 
         /// <summary> The NamespaceDiscoveredDevice items on this page. </summary>
-        public IReadOnlyList<DeviceRegistryNamespaceDiscoveredDeviceData> Value { get; }
+        public IReadOnlyList<NamespaceDiscoveredDeviceData> Value { get; }
         /// <summary> The link to the next page of items. </summary>
         public Uri NextLink { get; }
     }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredDevicePatch.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDevicePatch.Serialization.cs
similarity index 66%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredDevicePatch.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDevicePatch.Serialization.cs
index 65d5c44bac31..033e60f7e06c 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredDevicePatch.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDevicePatch.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceDiscoveredDevicePatch : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceDiscoveredDevicePatch>
+    public partial class NamespaceDiscoveredDevicePatch : IUtf8JsonSerializable, IJsonModel<NamespaceDiscoveredDevicePatch>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceDiscoveredDevicePatch>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceDiscoveredDevicePatch>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceDiscoveredDevicePatch>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceDiscoveredDevicePatch>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceDiscoveredDevicePatch>.Write(Utf8JsonWrit
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredDevicePatch)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDiscoveredDevicePatch)} does not support writing '{format}' format.");
             }
 
             if (Optional.IsCollectionDefined(Tags))
@@ -67,19 +67,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceDiscoveredDevicePatch IJsonModel<DeviceRegistryNamespaceDiscoveredDevicePatch>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceDiscoveredDevicePatch IJsonModel<NamespaceDiscoveredDevicePatch>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredDevicePatch)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDiscoveredDevicePatch)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceDiscoveredDevicePatch(document.RootElement, options);
+            return DeserializeNamespaceDiscoveredDevicePatch(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceDiscoveredDevicePatch DeserializeDeviceRegistryNamespaceDiscoveredDevicePatch(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceDiscoveredDevicePatch DeserializeNamespaceDiscoveredDevicePatch(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -122,38 +122,38 @@ internal static DeviceRegistryNamespaceDiscoveredDevicePatch DeserializeDeviceRe
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceDiscoveredDevicePatch(tags ?? new ChangeTrackingDictionary<string, string>(), properties, serializedAdditionalRawData);
+            return new NamespaceDiscoveredDevicePatch(tags ?? new ChangeTrackingDictionary<string, string>(), properties, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceDiscoveredDevicePatch>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceDiscoveredDevicePatch>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredDevicePatch)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDiscoveredDevicePatch)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceDiscoveredDevicePatch IPersistableModel<DeviceRegistryNamespaceDiscoveredDevicePatch>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceDiscoveredDevicePatch IPersistableModel<NamespaceDiscoveredDevicePatch>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredDevicePatch>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceDiscoveredDevicePatch(document.RootElement, options);
+                        return DeserializeNamespaceDiscoveredDevicePatch(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredDevicePatch)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDiscoveredDevicePatch)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceDiscoveredDevicePatch>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceDiscoveredDevicePatch>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredDevicePatch.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDevicePatch.cs
similarity index 81%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredDevicePatch.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDevicePatch.cs
index 0217973b9a1e..714f301ec1c6 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredDevicePatch.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDevicePatch.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> The type used for update operations of the NamespaceDiscoveredDevice. </summary>
-    public partial class DeviceRegistryNamespaceDiscoveredDevicePatch
+    public partial class NamespaceDiscoveredDevicePatch
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,17 +45,17 @@ public partial class DeviceRegistryNamespaceDiscoveredDevicePatch
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredDevicePatch"/>. </summary>
-        public DeviceRegistryNamespaceDiscoveredDevicePatch()
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredDevicePatch"/>. </summary>
+        public NamespaceDiscoveredDevicePatch()
         {
             Tags = new ChangeTrackingDictionary<string, string>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredDevicePatch"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredDevicePatch"/>. </summary>
         /// <param name="tags"> Resource tags. </param>
         /// <param name="properties"> The resource-specific properties for this resource. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceDiscoveredDevicePatch(IDictionary<string, string> tags, NamespaceDiscoveredDeviceUpdateProperties properties, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceDiscoveredDevicePatch(IDictionary<string, string> tags, NamespaceDiscoveredDeviceUpdateProperties properties, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Tags = tags;
             Properties = properties;
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredDeviceProperties.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDeviceProperties.Serialization.cs
similarity index 79%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredDeviceProperties.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDeviceProperties.Serialization.cs
index 4e30448c8b58..58dd5ff8c372 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredDeviceProperties.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDeviceProperties.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceDiscoveredDeviceProperties : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceDiscoveredDeviceProperties>
+    public partial class NamespaceDiscoveredDeviceProperties : IUtf8JsonSerializable, IJsonModel<NamespaceDiscoveredDeviceProperties>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceDiscoveredDeviceProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceDiscoveredDeviceProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceDiscoveredDeviceProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceDiscoveredDeviceProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceDiscoveredDeviceProperties>.Write(Utf8Jso
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredDeviceProperties)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDiscoveredDeviceProperties)} does not support writing '{format}' format.");
             }
 
             if (Optional.IsDefined(ExternalDeviceId))
@@ -113,19 +113,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceDiscoveredDeviceProperties IJsonModel<DeviceRegistryNamespaceDiscoveredDeviceProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceDiscoveredDeviceProperties IJsonModel<NamespaceDiscoveredDeviceProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredDeviceProperties)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDiscoveredDeviceProperties)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceDiscoveredDeviceProperties(document.RootElement, options);
+            return DeserializeNamespaceDiscoveredDeviceProperties(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceDiscoveredDeviceProperties DeserializeDeviceRegistryNamespaceDiscoveredDeviceProperties(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceDiscoveredDeviceProperties DeserializeNamespaceDiscoveredDeviceProperties(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -227,7 +227,7 @@ internal static DeviceRegistryNamespaceDiscoveredDeviceProperties DeserializeDev
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceDiscoveredDeviceProperties(
+            return new NamespaceDiscoveredDeviceProperties(
                 externalDeviceId,
                 endpoints,
                 manufacturer,
@@ -241,35 +241,35 @@ internal static DeviceRegistryNamespaceDiscoveredDeviceProperties DeserializeDev
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceProperties>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceDiscoveredDeviceProperties>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredDeviceProperties)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDiscoveredDeviceProperties)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceDiscoveredDeviceProperties IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceDiscoveredDeviceProperties IPersistableModel<NamespaceDiscoveredDeviceProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredDeviceProperties>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceDiscoveredDeviceProperties(document.RootElement, options);
+                        return DeserializeNamespaceDiscoveredDeviceProperties(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredDeviceProperties)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDiscoveredDeviceProperties)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceDiscoveredDeviceProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredDeviceProperties.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDeviceProperties.cs
similarity index 85%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredDeviceProperties.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDeviceProperties.cs
index 1146aecc427f..a26e0fddd178 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceDiscoveredDeviceProperties.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceDiscoveredDeviceProperties.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> Defines the discovered device properties. </summary>
-    public partial class DeviceRegistryNamespaceDiscoveredDeviceProperties
+    public partial class NamespaceDiscoveredDeviceProperties
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,11 +45,11 @@ public partial class DeviceRegistryNamespaceDiscoveredDeviceProperties
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredDeviceProperties"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredDeviceProperties"/>. </summary>
         /// <param name="discoveryId"> Identifier used to detect changes in the discovered device. </param>
         /// <param name="version"> An integer that is incremented each time the resource is modified. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="discoveryId"/> is null. </exception>
-        public DeviceRegistryNamespaceDiscoveredDeviceProperties(string discoveryId, long version)
+        public NamespaceDiscoveredDeviceProperties(string discoveryId, long version)
         {
             Argument.AssertNotNull(discoveryId, nameof(discoveryId));
 
@@ -58,7 +58,7 @@ public DeviceRegistryNamespaceDiscoveredDeviceProperties(string discoveryId, lon
             Version = version;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredDeviceProperties"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredDeviceProperties"/>. </summary>
         /// <param name="externalDeviceId"> A device ID that represents the device in a system external to Azure. Unique within scope of an Azure tenant. </param>
         /// <param name="endpoints"> Endpoints for discovered devices. </param>
         /// <param name="manufacturer"> Device manufacturer. </param>
@@ -70,7 +70,7 @@ public DeviceRegistryNamespaceDiscoveredDeviceProperties(string discoveryId, lon
         /// <param name="version"> An integer that is incremented each time the resource is modified. </param>
         /// <param name="provisioningState"> Provisioning state of the resource. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceDiscoveredDeviceProperties(string externalDeviceId, DiscoveredMessagingEndpoints endpoints, string manufacturer, string model, string operatingSystem, string operatingSystemVersion, IDictionary<string, BinaryData> attributes, string discoveryId, long version, DeviceRegistryProvisioningState? provisioningState, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceDiscoveredDeviceProperties(string externalDeviceId, DiscoveredMessagingEndpoints endpoints, string manufacturer, string model, string operatingSystem, string operatingSystemVersion, IDictionary<string, BinaryData> attributes, string discoveryId, long version, DeviceRegistryProvisioningState? provisioningState, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             ExternalDeviceId = externalDeviceId;
             Endpoints = endpoints;
@@ -85,8 +85,8 @@ internal DeviceRegistryNamespaceDiscoveredDeviceProperties(string externalDevice
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredDeviceProperties"/> for deserialization. </summary>
-        internal DeviceRegistryNamespaceDiscoveredDeviceProperties()
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredDeviceProperties"/> for deserialization. </summary>
+        internal NamespaceDiscoveredDeviceProperties()
         {
         }
 
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceListResult.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceListResult.Serialization.cs
index 1758444162c9..ddba1c5ef954 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceListResult.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceListResult.Serialization.cs
@@ -83,7 +83,7 @@ internal static NamespaceListResult DeserializeNamespaceListResult(JsonElement e
             {
                 return null;
             }
-            IReadOnlyList<DeviceRegistryNamespaceData> value = default;
+            IReadOnlyList<NamespaceData> value = default;
             Uri nextLink = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
@@ -91,10 +91,10 @@ internal static NamespaceListResult DeserializeNamespaceListResult(JsonElement e
             {
                 if (property.NameEquals("value"u8))
                 {
-                    List<DeviceRegistryNamespaceData> array = new List<DeviceRegistryNamespaceData>();
+                    List<NamespaceData> array = new List<NamespaceData>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(DeviceRegistryNamespaceData.DeserializeDeviceRegistryNamespaceData(item, options));
+                        array.Add(NamespaceData.DeserializeNamespaceData(item, options));
                     }
                     value = array;
                     continue;
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceListResult.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceListResult.cs
index fd131679ba8e..4958007e0983 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceListResult.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceListResult.cs
@@ -49,7 +49,7 @@ internal partial class NamespaceListResult
         /// <summary> Initializes a new instance of <see cref="NamespaceListResult"/>. </summary>
         /// <param name="value"> The Namespace items on this page. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        internal NamespaceListResult(IEnumerable<DeviceRegistryNamespaceData> value)
+        internal NamespaceListResult(IEnumerable<NamespaceData> value)
         {
             Argument.AssertNotNull(value, nameof(value));
 
@@ -60,7 +60,7 @@ internal NamespaceListResult(IEnumerable<DeviceRegistryNamespaceData> value)
         /// <param name="value"> The Namespace items on this page. </param>
         /// <param name="nextLink"> The link to the next page of items. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal NamespaceListResult(IReadOnlyList<DeviceRegistryNamespaceData> value, Uri nextLink, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceListResult(IReadOnlyList<NamespaceData> value, Uri nextLink, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Value = value;
             NextLink = nextLink;
@@ -73,7 +73,7 @@ internal NamespaceListResult()
         }
 
         /// <summary> The Namespace items on this page. </summary>
-        public IReadOnlyList<DeviceRegistryNamespaceData> Value { get; }
+        public IReadOnlyList<NamespaceData> Value { get; }
         /// <summary> The link to the next page of items. </summary>
         public Uri NextLink { get; }
     }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceMessageSchemaReference.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceMessageSchemaReference.Serialization.cs
similarity index 64%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceMessageSchemaReference.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceMessageSchemaReference.Serialization.cs
index 4d9f37a189e1..02d0f4e3334e 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceMessageSchemaReference.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceMessageSchemaReference.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceMessageSchemaReference : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceMessageSchemaReference>
+    public partial class NamespaceMessageSchemaReference : IUtf8JsonSerializable, IJsonModel<NamespaceMessageSchemaReference>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceMessageSchemaReference>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceMessageSchemaReference>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceMessageSchemaReference>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceMessageSchemaReference>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceMessageSchemaReference>.Write(Utf8JsonWri
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceMessageSchemaReference>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceMessageSchemaReference>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceMessageSchemaReference)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceMessageSchemaReference)} does not support writing '{format}' format.");
             }
 
             if (options.Format != "W")
@@ -66,19 +66,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceMessageSchemaReference IJsonModel<DeviceRegistryNamespaceMessageSchemaReference>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceMessageSchemaReference IJsonModel<NamespaceMessageSchemaReference>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceMessageSchemaReference>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceMessageSchemaReference>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceMessageSchemaReference)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceMessageSchemaReference)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceMessageSchemaReference(document.RootElement, options);
+            return DeserializeNamespaceMessageSchemaReference(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceMessageSchemaReference DeserializeDeviceRegistryNamespaceMessageSchemaReference(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceMessageSchemaReference DeserializeNamespaceMessageSchemaReference(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -114,38 +114,38 @@ internal static DeviceRegistryNamespaceMessageSchemaReference DeserializeDeviceR
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceMessageSchemaReference(schemaRegistryNamespace, schemaName, schemaVersion, serializedAdditionalRawData);
+            return new NamespaceMessageSchemaReference(schemaRegistryNamespace, schemaName, schemaVersion, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceMessageSchemaReference>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceMessageSchemaReference>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceMessageSchemaReference>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceMessageSchemaReference>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceMessageSchemaReference)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceMessageSchemaReference)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceMessageSchemaReference IPersistableModel<DeviceRegistryNamespaceMessageSchemaReference>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceMessageSchemaReference IPersistableModel<NamespaceMessageSchemaReference>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceMessageSchemaReference>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceMessageSchemaReference>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceMessageSchemaReference(document.RootElement, options);
+                        return DeserializeNamespaceMessageSchemaReference(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceMessageSchemaReference)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceMessageSchemaReference)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceMessageSchemaReference>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceMessageSchemaReference>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceMessageSchemaReference.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceMessageSchemaReference.cs
similarity index 78%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceMessageSchemaReference.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceMessageSchemaReference.cs
index 377c67b5e131..fd189c68a30e 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceMessageSchemaReference.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceMessageSchemaReference.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> Defines the message schema reference properties. </summary>
-    public partial class DeviceRegistryNamespaceMessageSchemaReference
+    public partial class NamespaceMessageSchemaReference
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,23 +45,23 @@ public partial class DeviceRegistryNamespaceMessageSchemaReference
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceMessageSchemaReference"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceMessageSchemaReference"/>. </summary>
         /// <param name="schemaRegistryNamespace"> The message schema registry namespace. </param>
         /// <param name="schemaName"> The message schema name. </param>
         /// <param name="schemaVersion"> The message schema version. </param>
-        internal DeviceRegistryNamespaceMessageSchemaReference(string schemaRegistryNamespace, string schemaName, string schemaVersion)
+        internal NamespaceMessageSchemaReference(string schemaRegistryNamespace, string schemaName, string schemaVersion)
         {
             SchemaRegistryNamespace = schemaRegistryNamespace;
             SchemaName = schemaName;
             SchemaVersion = schemaVersion;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceMessageSchemaReference"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceMessageSchemaReference"/>. </summary>
         /// <param name="schemaRegistryNamespace"> The message schema registry namespace. </param>
         /// <param name="schemaName"> The message schema name. </param>
         /// <param name="schemaVersion"> The message schema version. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceMessageSchemaReference(string schemaRegistryNamespace, string schemaName, string schemaVersion, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceMessageSchemaReference(string schemaRegistryNamespace, string schemaName, string schemaVersion, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             SchemaRegistryNamespace = schemaRegistryNamespace;
             SchemaName = schemaName;
@@ -69,8 +69,8 @@ internal DeviceRegistryNamespaceMessageSchemaReference(string schemaRegistryName
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceMessageSchemaReference"/> for deserialization. </summary>
-        internal DeviceRegistryNamespaceMessageSchemaReference()
+        /// <summary> Initializes a new instance of <see cref="NamespaceMessageSchemaReference"/> for deserialization. </summary>
+        internal NamespaceMessageSchemaReference()
         {
         }
 
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespacePatch.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespacePatch.Serialization.cs
similarity index 72%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespacePatch.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespacePatch.Serialization.cs
index 5ceb164bb6dc..fc4d53f61d5a 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespacePatch.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespacePatch.Serialization.cs
@@ -15,11 +15,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespacePatch : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespacePatch>
+    public partial class NamespacePatch : IUtf8JsonSerializable, IJsonModel<NamespacePatch>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespacePatch>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespacePatch>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespacePatch>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespacePatch>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -30,10 +30,10 @@ void IJsonModel<DeviceRegistryNamespacePatch>.Write(Utf8JsonWriter writer, Model
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespacePatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespacePatch>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespacePatch)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespacePatch)} does not support writing '{format}' format.");
             }
 
             if (Optional.IsDefined(Identity))
@@ -74,19 +74,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespacePatch IJsonModel<DeviceRegistryNamespacePatch>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespacePatch IJsonModel<NamespacePatch>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespacePatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespacePatch>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespacePatch)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespacePatch)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespacePatch(document.RootElement, options);
+            return DeserializeNamespacePatch(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespacePatch DeserializeDeviceRegistryNamespacePatch(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespacePatch DeserializeNamespacePatch(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -139,38 +139,38 @@ internal static DeviceRegistryNamespacePatch DeserializeDeviceRegistryNamespaceP
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespacePatch(identity, tags ?? new ChangeTrackingDictionary<string, string>(), properties, serializedAdditionalRawData);
+            return new NamespacePatch(identity, tags ?? new ChangeTrackingDictionary<string, string>(), properties, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespacePatch>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespacePatch>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespacePatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespacePatch>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespacePatch)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespacePatch)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespacePatch IPersistableModel<DeviceRegistryNamespacePatch>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespacePatch IPersistableModel<NamespacePatch>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespacePatch>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespacePatch>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespacePatch(document.RootElement, options);
+                        return DeserializeNamespacePatch(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespacePatch)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespacePatch)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespacePatch>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespacePatch>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespacePatch.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespacePatch.cs
similarity index 86%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespacePatch.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespacePatch.cs
index 1f8ecc5867c6..7718ae9ca701 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespacePatch.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespacePatch.cs
@@ -12,7 +12,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> The type used for update operations of the Namespace. </summary>
-    public partial class DeviceRegistryNamespacePatch
+    public partial class NamespacePatch
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -46,18 +46,18 @@ public partial class DeviceRegistryNamespacePatch
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespacePatch"/>. </summary>
-        public DeviceRegistryNamespacePatch()
+        /// <summary> Initializes a new instance of <see cref="NamespacePatch"/>. </summary>
+        public NamespacePatch()
         {
             Tags = new ChangeTrackingDictionary<string, string>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespacePatch"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespacePatch"/>. </summary>
         /// <param name="identity"> The managed service identities assigned to this resource. Current supported identity types: None, SystemAssigned. </param>
         /// <param name="tags"> Resource tags. </param>
         /// <param name="properties"> The resource-specific properties for this resource. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespacePatch(ManagedServiceIdentity identity, IDictionary<string, string> tags, NamespaceUpdateProperties properties, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespacePatch(ManagedServiceIdentity identity, IDictionary<string, string> tags, NamespaceUpdateProperties properties, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Identity = identity;
             Tags = tags;
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceProperties.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceProperties.Serialization.cs
similarity index 68%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceProperties.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceProperties.Serialization.cs
index d99d6c827787..c9da5ed1be73 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceProperties.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceProperties.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryNamespaceProperties : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceProperties>
+    public partial class NamespaceProperties : IUtf8JsonSerializable, IJsonModel<NamespaceProperties>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryNamespaceProperties>.Write(Utf8JsonWriter writer,
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceProperties)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceProperties)} does not support writing '{format}' format.");
             }
 
             if (options.Format != "W" && Optional.IsDefined(Uuid))
@@ -66,19 +66,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryNamespaceProperties IJsonModel<DeviceRegistryNamespaceProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceProperties IJsonModel<NamespaceProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceProperties)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceProperties)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceProperties(document.RootElement, options);
+            return DeserializeNamespaceProperties(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceProperties DeserializeDeviceRegistryNamespaceProperties(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceProperties DeserializeNamespaceProperties(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -122,38 +122,38 @@ internal static DeviceRegistryNamespaceProperties DeserializeDeviceRegistryNames
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceProperties(uuid, messaging, provisioningState, serializedAdditionalRawData);
+            return new NamespaceProperties(uuid, messaging, provisioningState, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceProperties>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceProperties>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceProperties>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceProperties)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceProperties)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceProperties IPersistableModel<DeviceRegistryNamespaceProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceProperties IPersistableModel<NamespaceProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceProperties>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceProperties(document.RootElement, options);
+                        return DeserializeNamespaceProperties(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceProperties)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceProperties)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceProperties.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceProperties.cs
similarity index 85%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceProperties.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceProperties.cs
index f393fb3ce0ca..bd94dca7dea5 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryNamespaceProperties.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/NamespaceProperties.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> The namespace properties model. </summary>
-    public partial class DeviceRegistryNamespaceProperties
+    public partial class NamespaceProperties
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,17 +45,17 @@ public partial class DeviceRegistryNamespaceProperties
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceProperties"/>. </summary>
-        public DeviceRegistryNamespaceProperties()
+        /// <summary> Initializes a new instance of <see cref="NamespaceProperties"/>. </summary>
+        public NamespaceProperties()
         {
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceProperties"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceProperties"/>. </summary>
         /// <param name="uuid"> Globally unique, immutable, non-reusable ID. </param>
         /// <param name="messaging"> Assigned and unassigned messaging endpoints. </param>
         /// <param name="provisioningState"> Provisioning state of the resource. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceProperties(string uuid, Messaging messaging, DeviceRegistryProvisioningState? provisioningState, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal NamespaceProperties(string uuid, Messaging messaging, DeviceRegistryProvisioningState? provisioningState, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Uuid = uuid;
             Messaging = messaging;
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryStatusConfig.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/StatusConfig.Serialization.cs
similarity index 68%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryStatusConfig.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/StatusConfig.Serialization.cs
index 67a2795fdbb8..e55fb16af9f5 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryStatusConfig.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/StatusConfig.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryStatusConfig : IUtf8JsonSerializable, IJsonModel<DeviceRegistryStatusConfig>
+    public partial class StatusConfig : IUtf8JsonSerializable, IJsonModel<StatusConfig>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryStatusConfig>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StatusConfig>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryStatusConfig>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<StatusConfig>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryStatusConfig>.Write(Utf8JsonWriter writer, ModelRe
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryStatusConfig>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<StatusConfig>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryStatusConfig)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(StatusConfig)} does not support writing '{format}' format.");
             }
 
             if (options.Format != "W" && Optional.IsDefined(Version))
@@ -66,19 +66,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryStatusConfig IJsonModel<DeviceRegistryStatusConfig>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        StatusConfig IJsonModel<StatusConfig>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryStatusConfig>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<StatusConfig>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryStatusConfig)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(StatusConfig)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryStatusConfig(document.RootElement, options);
+            return DeserializeStatusConfig(document.RootElement, options);
         }
 
-        internal static DeviceRegistryStatusConfig DeserializeDeviceRegistryStatusConfig(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static StatusConfig DeserializeStatusConfig(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -88,7 +88,7 @@ internal static DeviceRegistryStatusConfig DeserializeDeviceRegistryStatusConfig
             }
             long? version = default;
             DateTimeOffset? lastTransitionTime = default;
-            DeviceRegistryStatusError error = default;
+            StatusError error = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -117,7 +117,7 @@ internal static DeviceRegistryStatusConfig DeserializeDeviceRegistryStatusConfig
                     {
                         continue;
                     }
-                    error = DeviceRegistryStatusError.DeserializeDeviceRegistryStatusError(property.Value, options);
+                    error = StatusError.DeserializeStatusError(property.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
@@ -126,38 +126,38 @@ internal static DeviceRegistryStatusConfig DeserializeDeviceRegistryStatusConfig
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryStatusConfig(version, lastTransitionTime, error, serializedAdditionalRawData);
+            return new StatusConfig(version, lastTransitionTime, error, serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryStatusConfig>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<StatusConfig>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryStatusConfig>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<StatusConfig>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryStatusConfig)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(StatusConfig)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryStatusConfig IPersistableModel<DeviceRegistryStatusConfig>.Create(BinaryData data, ModelReaderWriterOptions options)
+        StatusConfig IPersistableModel<StatusConfig>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryStatusConfig>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<StatusConfig>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryStatusConfig(document.RootElement, options);
+                        return DeserializeStatusConfig(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryStatusConfig)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(StatusConfig)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryStatusConfig>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<StatusConfig>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryStatusConfig.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/StatusConfig.cs
similarity index 86%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryStatusConfig.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/StatusConfig.cs
index fe20731b52cf..fa41592729fd 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryStatusConfig.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/StatusConfig.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> Defines the status config properties. </summary>
-    public partial class DeviceRegistryStatusConfig
+    public partial class StatusConfig
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,17 +45,17 @@ public partial class DeviceRegistryStatusConfig
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryStatusConfig"/>. </summary>
-        internal DeviceRegistryStatusConfig()
+        /// <summary> Initializes a new instance of <see cref="StatusConfig"/>. </summary>
+        internal StatusConfig()
         {
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryStatusConfig"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="StatusConfig"/>. </summary>
         /// <param name="version"> A read-only incremental counter indicating the number of times the configuration has been modified from the perspective of the current actual (edge) state of the CRD. Edge would be the only writer of this value and would sync back up to the cloud. In steady state, this should equal version. </param>
         /// <param name="lastTransitionOn"> A read-only timestamp indicating the last time the configuration has been modified from the perspective of the current actual (edge) state of the CRD. Edge would be the only writer of this value and would sync back up to the cloud. </param>
         /// <param name="error"> Object to transfer and persist errors that originate from the edge. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryStatusConfig(long? version, DateTimeOffset? lastTransitionOn, DeviceRegistryStatusError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal StatusConfig(long? version, DateTimeOffset? lastTransitionOn, StatusError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Version = version;
             LastTransitionOn = lastTransitionOn;
@@ -68,6 +68,6 @@ internal DeviceRegistryStatusConfig(long? version, DateTimeOffset? lastTransitio
         /// <summary> A read-only timestamp indicating the last time the configuration has been modified from the perspective of the current actual (edge) state of the CRD. Edge would be the only writer of this value and would sync back up to the cloud. </summary>
         public DateTimeOffset? LastTransitionOn { get; }
         /// <summary> Object to transfer and persist errors that originate from the edge. </summary>
-        public DeviceRegistryStatusError Error { get; }
+        public StatusError Error { get; }
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryStatusError.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/StatusError.Serialization.cs
similarity index 67%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryStatusError.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/StatusError.Serialization.cs
index 7acb10f39680..1527e26e228f 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryStatusError.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/StatusError.Serialization.cs
@@ -13,11 +13,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
-    public partial class DeviceRegistryStatusError : IUtf8JsonSerializable, IJsonModel<DeviceRegistryStatusError>
+    public partial class StatusError : IUtf8JsonSerializable, IJsonModel<StatusError>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryStatusError>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<StatusError>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryStatusError>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<StatusError>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -28,10 +28,10 @@ void IJsonModel<DeviceRegistryStatusError>.Write(Utf8JsonWriter writer, ModelRea
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryStatusError>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<StatusError>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryStatusError)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(StatusError)} does not support writing '{format}' format.");
             }
 
             if (options.Format != "W" && Optional.IsDefined(Code))
@@ -71,19 +71,19 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DeviceRegistryStatusError IJsonModel<DeviceRegistryStatusError>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        StatusError IJsonModel<StatusError>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryStatusError>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<StatusError>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryStatusError)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(StatusError)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryStatusError(document.RootElement, options);
+            return DeserializeStatusError(document.RootElement, options);
         }
 
-        internal static DeviceRegistryStatusError DeserializeDeviceRegistryStatusError(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static StatusError DeserializeStatusError(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -93,7 +93,7 @@ internal static DeviceRegistryStatusError DeserializeDeviceRegistryStatusError(J
             }
             string code = default;
             string message = default;
-            IReadOnlyList<DeviceRegistryErrorDetails> details = default;
+            IReadOnlyList<ErrorDetails> details = default;
             IDictionary<string, BinaryData> serializedAdditionalRawData = default;
             Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
             foreach (var property in element.EnumerateObject())
@@ -114,10 +114,10 @@ internal static DeviceRegistryStatusError DeserializeDeviceRegistryStatusError(J
                     {
                         continue;
                     }
-                    List<DeviceRegistryErrorDetails> array = new List<DeviceRegistryErrorDetails>();
+                    List<ErrorDetails> array = new List<ErrorDetails>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(DeviceRegistryErrorDetails.DeserializeDeviceRegistryErrorDetails(item, options));
+                        array.Add(ErrorDetails.DeserializeErrorDetails(item, options));
                     }
                     details = array;
                     continue;
@@ -128,38 +128,38 @@ internal static DeviceRegistryStatusError DeserializeDeviceRegistryStatusError(J
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryStatusError(code, message, details ?? new ChangeTrackingList<DeviceRegistryErrorDetails>(), serializedAdditionalRawData);
+            return new StatusError(code, message, details ?? new ChangeTrackingList<ErrorDetails>(), serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryStatusError>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<StatusError>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryStatusError>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<StatusError>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryStatusError)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(StatusError)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryStatusError IPersistableModel<DeviceRegistryStatusError>.Create(BinaryData data, ModelReaderWriterOptions options)
+        StatusError IPersistableModel<StatusError>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryStatusError>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<StatusError>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryStatusError(document.RootElement, options);
+                        return DeserializeStatusError(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryStatusError)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(StatusError)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryStatusError>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<StatusError>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryStatusError.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/StatusError.cs
similarity index 81%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryStatusError.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/StatusError.cs
index d3613c995f05..94a64bc82768 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/DeviceRegistryStatusError.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/Models/StatusError.cs
@@ -11,7 +11,7 @@
 namespace Azure.ResourceManager.DeviceRegistry.Models
 {
     /// <summary> Defines the status config error properties. </summary>
-    public partial class DeviceRegistryStatusError
+    public partial class StatusError
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -45,18 +45,18 @@ public partial class DeviceRegistryStatusError
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryStatusError"/>. </summary>
-        internal DeviceRegistryStatusError()
+        /// <summary> Initializes a new instance of <see cref="StatusError"/>. </summary>
+        internal StatusError()
         {
-            Details = new ChangeTrackingList<DeviceRegistryErrorDetails>();
+            Details = new ChangeTrackingList<ErrorDetails>();
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryStatusError"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="StatusError"/>. </summary>
         /// <param name="code"> Error code for classification of errors (ex: '400', '404', '500', etc.). </param>
         /// <param name="message"> Human-readable helpful error message to provide additional context for error (e.g.,: “Capability ID 'foo' does not exist”). </param>
         /// <param name="details"> Array of error details that describe the status of each error. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryStatusError(string code, string message, IReadOnlyList<DeviceRegistryErrorDetails> details, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        internal StatusError(string code, string message, IReadOnlyList<ErrorDetails> details, IDictionary<string, BinaryData> serializedAdditionalRawData)
         {
             Code = code;
             Message = message;
@@ -69,6 +69,6 @@ internal DeviceRegistryStatusError(string code, string message, IReadOnlyList<De
         /// <summary> Human-readable helpful error message to provide additional context for error (e.g.,: “Capability ID 'foo' does not exist”). </summary>
         public string Message { get; }
         /// <summary> Array of error details that describe the status of each error. </summary>
-        public IReadOnlyList<DeviceRegistryErrorDetails> Details { get; }
+        public IReadOnlyList<ErrorDetails> Details { get; }
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceAssetCollection.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceAssetCollection.cs
similarity index 62%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceAssetCollection.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceAssetCollection.cs
index ebf3be0474c1..e4adef78ef24 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceAssetCollection.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceAssetCollection.cs
@@ -18,28 +18,28 @@
 namespace Azure.ResourceManager.DeviceRegistry
 {
     /// <summary>
-    /// A class representing a collection of <see cref="DeviceRegistryNamespaceAssetResource"/> and their operations.
-    /// Each <see cref="DeviceRegistryNamespaceAssetResource"/> in the collection will belong to the same instance of <see cref="DeviceRegistryNamespaceResource"/>.
-    /// To get a <see cref="DeviceRegistryNamespaceAssetCollection"/> instance call the GetDeviceRegistryNamespaceAssets method from an instance of <see cref="DeviceRegistryNamespaceResource"/>.
+    /// A class representing a collection of <see cref="NamespaceAssetResource"/> and their operations.
+    /// Each <see cref="NamespaceAssetResource"/> in the collection will belong to the same instance of <see cref="NamespaceResource"/>.
+    /// To get a <see cref="NamespaceAssetCollection"/> instance call the GetNamespaceAssets method from an instance of <see cref="NamespaceResource"/>.
     /// </summary>
-    public partial class DeviceRegistryNamespaceAssetCollection : ArmCollection, IEnumerable<DeviceRegistryNamespaceAssetResource>, IAsyncEnumerable<DeviceRegistryNamespaceAssetResource>
+    public partial class NamespaceAssetCollection : ArmCollection, IEnumerable<NamespaceAssetResource>, IAsyncEnumerable<NamespaceAssetResource>
     {
-        private readonly ClientDiagnostics _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics;
-        private readonly NamespaceAssetsRestOperations _deviceRegistryNamespaceAssetNamespaceAssetsRestClient;
+        private readonly ClientDiagnostics _namespaceAssetClientDiagnostics;
+        private readonly NamespaceAssetsRestOperations _namespaceAssetRestClient;
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceAssetCollection"/> class for mocking. </summary>
-        protected DeviceRegistryNamespaceAssetCollection()
+        /// <summary> Initializes a new instance of the <see cref="NamespaceAssetCollection"/> class for mocking. </summary>
+        protected NamespaceAssetCollection()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceAssetCollection"/> class. </summary>
+        /// <summary> Initializes a new instance of the <see cref="NamespaceAssetCollection"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the parent resource that is the target of operations. </param>
-        internal DeviceRegistryNamespaceAssetCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
+        internal NamespaceAssetCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", DeviceRegistryNamespaceAssetResource.ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(DeviceRegistryNamespaceAssetResource.ResourceType, out string deviceRegistryNamespaceAssetNamespaceAssetsApiVersion);
-            _deviceRegistryNamespaceAssetNamespaceAssetsRestClient = new NamespaceAssetsRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, deviceRegistryNamespaceAssetNamespaceAssetsApiVersion);
+            _namespaceAssetClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", NamespaceAssetResource.ResourceType.Namespace, Diagnostics);
+            TryGetApiVersion(NamespaceAssetResource.ResourceType, out string namespaceAssetApiVersion);
+            _namespaceAssetRestClient = new NamespaceAssetsRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, namespaceAssetApiVersion);
 #if DEBUG
 			ValidateResourceId(Id);
 #endif
@@ -47,8 +47,8 @@ internal DeviceRegistryNamespaceAssetCollection(ArmClient client, ResourceIdenti
 
         internal static void ValidateResourceId(ResourceIdentifier id)
         {
-            if (id.ResourceType != DeviceRegistryNamespaceResource.ResourceType)
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, "Invalid resource type {0} expected {1}", id.ResourceType, DeviceRegistryNamespaceResource.ResourceType), nameof(id));
+            if (id.ResourceType != NamespaceResource.ResourceType)
+                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, "Invalid resource type {0} expected {1}", id.ResourceType, NamespaceResource.ResourceType), nameof(id));
         }
 
         /// <summary>
@@ -68,7 +68,7 @@ internal static void ValidateResourceId(ResourceIdentifier id)
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -78,17 +78,17 @@ internal static void ValidateResourceId(ResourceIdentifier id)
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="assetName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="assetName"/> or <paramref name="data"/> is null. </exception>
-        public virtual async Task<ArmOperation<DeviceRegistryNamespaceAssetResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string assetName, DeviceRegistryNamespaceAssetData data, CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<NamespaceAssetResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string assetName, NamespaceAssetData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(assetName, nameof(assetName));
             Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetCollection.CreateOrUpdate");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.CreateOrReplaceAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, data, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceAssetResource>(new DeviceRegistryNamespaceAssetOperationSource(Client), _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics, Pipeline, _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                var response = await _namespaceAssetRestClient.CreateOrReplaceAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, data, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation<NamespaceAssetResource>(new NamespaceAssetOperationSource(Client), _namespaceAssetClientDiagnostics, Pipeline, _namespaceAssetRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -117,7 +117,7 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceAssetResource>> Cr
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -127,17 +127,17 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceAssetResource>> Cr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="assetName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="assetName"/> or <paramref name="data"/> is null. </exception>
-        public virtual ArmOperation<DeviceRegistryNamespaceAssetResource> CreateOrUpdate(WaitUntil waitUntil, string assetName, DeviceRegistryNamespaceAssetData data, CancellationToken cancellationToken = default)
+        public virtual ArmOperation<NamespaceAssetResource> CreateOrUpdate(WaitUntil waitUntil, string assetName, NamespaceAssetData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(assetName, nameof(assetName));
             Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetCollection.CreateOrUpdate");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.CreateOrReplace(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, data, cancellationToken);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceAssetResource>(new DeviceRegistryNamespaceAssetOperationSource(Client), _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics, Pipeline, _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                var response = _namespaceAssetRestClient.CreateOrReplace(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, data, cancellationToken);
+                var operation = new DeviceRegistryArmOperation<NamespaceAssetResource>(new NamespaceAssetOperationSource(Client), _namespaceAssetClientDiagnostics, Pipeline, _namespaceAssetRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletion(cancellationToken);
                 return operation;
@@ -166,7 +166,7 @@ public virtual ArmOperation<DeviceRegistryNamespaceAssetResource> CreateOrUpdate
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -174,18 +174,18 @@ public virtual ArmOperation<DeviceRegistryNamespaceAssetResource> CreateOrUpdate
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="assetName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="assetName"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> GetAsync(string assetName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceAssetResource>> GetAsync(string assetName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(assetName, nameof(assetName));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetCollection.Get");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetCollection.Get");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceAssetRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, cancellationToken).ConfigureAwait(false);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceAssetResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceAssetResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -211,7 +211,7 @@ public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> GetAsy
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -219,18 +219,18 @@ public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> GetAsy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="assetName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="assetName"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceAssetResource> Get(string assetName, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceAssetResource> Get(string assetName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(assetName, nameof(assetName));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetCollection.Get");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetCollection.Get");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, cancellationToken);
+                var response = _namespaceAssetRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, cancellationToken);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceAssetResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceAssetResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -256,17 +256,17 @@ public virtual Response<DeviceRegistryNamespaceAssetResource> Get(string assetNa
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> An async collection of <see cref="DeviceRegistryNamespaceAssetResource"/> that may take multiple service requests to iterate over. </returns>
-        public virtual AsyncPageable<DeviceRegistryNamespaceAssetResource> GetAllAsync(CancellationToken cancellationToken = default)
+        /// <returns> An async collection of <see cref="NamespaceAssetResource"/> that may take multiple service requests to iterate over. </returns>
+        public virtual AsyncPageable<NamespaceAssetResource> GetAllAsync(CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new DeviceRegistryNamespaceAssetResource(Client, DeviceRegistryNamespaceAssetData.DeserializeDeviceRegistryNamespaceAssetData(e)), _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics, Pipeline, "DeviceRegistryNamespaceAssetCollection.GetAll", "value", "nextLink", cancellationToken);
+            HttpMessage FirstPageRequest(int? pageSizeHint) => _namespaceAssetRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _namespaceAssetRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new NamespaceAssetResource(Client, NamespaceAssetData.DeserializeNamespaceAssetData(e)), _namespaceAssetClientDiagnostics, Pipeline, "NamespaceAssetCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -286,17 +286,17 @@ public virtual AsyncPageable<DeviceRegistryNamespaceAssetResource> GetAllAsync(C
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> A collection of <see cref="DeviceRegistryNamespaceAssetResource"/> that may take multiple service requests to iterate over. </returns>
-        public virtual Pageable<DeviceRegistryNamespaceAssetResource> GetAll(CancellationToken cancellationToken = default)
+        /// <returns> A collection of <see cref="NamespaceAssetResource"/> that may take multiple service requests to iterate over. </returns>
+        public virtual Pageable<NamespaceAssetResource> GetAll(CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new DeviceRegistryNamespaceAssetResource(Client, DeviceRegistryNamespaceAssetData.DeserializeDeviceRegistryNamespaceAssetData(e)), _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics, Pipeline, "DeviceRegistryNamespaceAssetCollection.GetAll", "value", "nextLink", cancellationToken);
+            HttpMessage FirstPageRequest(int? pageSizeHint) => _namespaceAssetRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _namespaceAssetRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new NamespaceAssetResource(Client, NamespaceAssetData.DeserializeNamespaceAssetData(e)), _namespaceAssetClientDiagnostics, Pipeline, "NamespaceAssetCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -316,7 +316,7 @@ public virtual Pageable<DeviceRegistryNamespaceAssetResource> GetAll(Cancellatio
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -328,11 +328,11 @@ public virtual async Task<Response<bool>> ExistsAsync(string assetName, Cancella
         {
             Argument.AssertNotNullOrEmpty(assetName, nameof(assetName));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetCollection.Exists");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetCollection.Exists");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceAssetRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, cancellationToken: cancellationToken).ConfigureAwait(false);
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -359,7 +359,7 @@ public virtual async Task<Response<bool>> ExistsAsync(string assetName, Cancella
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -371,11 +371,11 @@ public virtual Response<bool> Exists(string assetName, CancellationToken cancell
         {
             Argument.AssertNotNullOrEmpty(assetName, nameof(assetName));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetCollection.Exists");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetCollection.Exists");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, cancellationToken: cancellationToken);
+                var response = _namespaceAssetRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, cancellationToken: cancellationToken);
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -402,7 +402,7 @@ public virtual Response<bool> Exists(string assetName, CancellationToken cancell
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -410,18 +410,18 @@ public virtual Response<bool> Exists(string assetName, CancellationToken cancell
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="assetName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="assetName"/> is null. </exception>
-        public virtual async Task<NullableResponse<DeviceRegistryNamespaceAssetResource>> GetIfExistsAsync(string assetName, CancellationToken cancellationToken = default)
+        public virtual async Task<NullableResponse<NamespaceAssetResource>> GetIfExistsAsync(string assetName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(assetName, nameof(assetName));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetCollection.GetIfExists");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceAssetRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, cancellationToken: cancellationToken).ConfigureAwait(false);
                 if (response.Value == null)
-                    return new NoValueResponse<DeviceRegistryNamespaceAssetResource>(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceAssetResource(Client, response.Value), response.GetRawResponse());
+                    return new NoValueResponse<NamespaceAssetResource>(response.GetRawResponse());
+                return Response.FromValue(new NamespaceAssetResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -447,7 +447,7 @@ public virtual async Task<NullableResponse<DeviceRegistryNamespaceAssetResource>
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -455,18 +455,18 @@ public virtual async Task<NullableResponse<DeviceRegistryNamespaceAssetResource>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="assetName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="assetName"/> is null. </exception>
-        public virtual NullableResponse<DeviceRegistryNamespaceAssetResource> GetIfExists(string assetName, CancellationToken cancellationToken = default)
+        public virtual NullableResponse<NamespaceAssetResource> GetIfExists(string assetName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(assetName, nameof(assetName));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetCollection.GetIfExists");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, cancellationToken: cancellationToken);
+                var response = _namespaceAssetRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, assetName, cancellationToken: cancellationToken);
                 if (response.Value == null)
-                    return new NoValueResponse<DeviceRegistryNamespaceAssetResource>(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceAssetResource(Client, response.Value), response.GetRawResponse());
+                    return new NoValueResponse<NamespaceAssetResource>(response.GetRawResponse());
+                return Response.FromValue(new NamespaceAssetResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -475,7 +475,7 @@ public virtual NullableResponse<DeviceRegistryNamespaceAssetResource> GetIfExist
             }
         }
 
-        IEnumerator<DeviceRegistryNamespaceAssetResource> IEnumerable<DeviceRegistryNamespaceAssetResource>.GetEnumerator()
+        IEnumerator<NamespaceAssetResource> IEnumerable<NamespaceAssetResource>.GetEnumerator()
         {
             return GetAll().GetEnumerator();
         }
@@ -485,7 +485,7 @@ IEnumerator IEnumerable.GetEnumerator()
             return GetAll().GetEnumerator();
         }
 
-        IAsyncEnumerator<DeviceRegistryNamespaceAssetResource> IAsyncEnumerable<DeviceRegistryNamespaceAssetResource>.GetAsyncEnumerator(CancellationToken cancellationToken)
+        IAsyncEnumerator<NamespaceAssetResource> IAsyncEnumerable<NamespaceAssetResource>.GetAsyncEnumerator(CancellationToken cancellationToken)
         {
             return GetAllAsync(cancellationToken: cancellationToken).GetAsyncEnumerator(cancellationToken);
         }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceAssetData.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceAssetData.Serialization.cs
similarity index 72%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceAssetData.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceAssetData.Serialization.cs
index 4f6aa14ec22d..9bc5bac51c82 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceAssetData.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceAssetData.Serialization.cs
@@ -16,11 +16,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry
 {
-    public partial class DeviceRegistryNamespaceAssetData : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceAssetData>
+    public partial class NamespaceAssetData : IUtf8JsonSerializable, IJsonModel<NamespaceAssetData>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceAssetData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceAssetData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceAssetData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceAssetData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -31,10 +31,10 @@ void IJsonModel<DeviceRegistryNamespaceAssetData>.Write(Utf8JsonWriter writer, M
         /// <param name="options"> The client options for reading and writing models. </param>
         protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetData)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetData)} does not support writing '{format}' format.");
             }
 
             base.JsonModelWriteCore(writer, options);
@@ -47,19 +47,19 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri
             writer.WriteObjectValue(ExtendedLocation, options);
         }
 
-        DeviceRegistryNamespaceAssetData IJsonModel<DeviceRegistryNamespaceAssetData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceAssetData IJsonModel<NamespaceAssetData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetData)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceAssetData)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceAssetData(document.RootElement, options);
+            return DeserializeNamespaceAssetData(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceAssetData DeserializeDeviceRegistryNamespaceAssetData(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceAssetData DeserializeNamespaceAssetData(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -67,7 +67,7 @@ internal static DeviceRegistryNamespaceAssetData DeserializeDeviceRegistryNamesp
             {
                 return null;
             }
-            DeviceRegistryNamespaceAssetProperties properties = default;
+            NamespaceAssetProperties properties = default;
             DeviceRegistryExtendedLocation extendedLocation = default;
             IDictionary<string, string> tags = default;
             AzureLocation location = default;
@@ -85,7 +85,7 @@ internal static DeviceRegistryNamespaceAssetData DeserializeDeviceRegistryNamesp
                     {
                         continue;
                     }
-                    properties = DeviceRegistryNamespaceAssetProperties.DeserializeDeviceRegistryNamespaceAssetProperties(property.Value, options);
+                    properties = NamespaceAssetProperties.DeserializeNamespaceAssetProperties(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("extendedLocation"u8))
@@ -142,7 +142,7 @@ internal static DeviceRegistryNamespaceAssetData DeserializeDeviceRegistryNamesp
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceAssetData(
+            return new NamespaceAssetData(
                 id,
                 name,
                 type,
@@ -154,35 +154,35 @@ internal static DeviceRegistryNamespaceAssetData DeserializeDeviceRegistryNamesp
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceAssetData>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceAssetData>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetData>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetData)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetData)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceAssetData IPersistableModel<DeviceRegistryNamespaceAssetData>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceAssetData IPersistableModel<NamespaceAssetData>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceAssetData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceAssetData>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceAssetData(document.RootElement, options);
+                        return DeserializeNamespaceAssetData(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceAssetData)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceAssetData)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceAssetData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceAssetData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceAssetData.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceAssetData.cs
similarity index 73%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceAssetData.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceAssetData.cs
index 75ae799a6b93..3723d9cfdbb9 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceAssetData.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceAssetData.cs
@@ -14,10 +14,10 @@
 namespace Azure.ResourceManager.DeviceRegistry
 {
     /// <summary>
-    /// A class representing the DeviceRegistryNamespaceAsset data model.
+    /// A class representing the NamespaceAsset data model.
     /// Asset definition.
     /// </summary>
-    public partial class DeviceRegistryNamespaceAssetData : TrackedResourceData
+    public partial class NamespaceAssetData : TrackedResourceData
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -51,18 +51,18 @@ public partial class DeviceRegistryNamespaceAssetData : TrackedResourceData
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetData"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetData"/>. </summary>
         /// <param name="location"> The location. </param>
         /// <param name="extendedLocation"> The extended location. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="extendedLocation"/> is null. </exception>
-        public DeviceRegistryNamespaceAssetData(AzureLocation location, DeviceRegistryExtendedLocation extendedLocation) : base(location)
+        public NamespaceAssetData(AzureLocation location, DeviceRegistryExtendedLocation extendedLocation) : base(location)
         {
             Argument.AssertNotNull(extendedLocation, nameof(extendedLocation));
 
             ExtendedLocation = extendedLocation;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetData"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetData"/>. </summary>
         /// <param name="id"> The id. </param>
         /// <param name="name"> The name. </param>
         /// <param name="resourceType"> The resourceType. </param>
@@ -72,20 +72,20 @@ public DeviceRegistryNamespaceAssetData(AzureLocation location, DeviceRegistryEx
         /// <param name="properties"> The resource-specific properties for this resource. </param>
         /// <param name="extendedLocation"> The extended location. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceAssetData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, string> tags, AzureLocation location, DeviceRegistryNamespaceAssetProperties properties, DeviceRegistryExtendedLocation extendedLocation, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData, tags, location)
+        internal NamespaceAssetData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, string> tags, AzureLocation location, NamespaceAssetProperties properties, DeviceRegistryExtendedLocation extendedLocation, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData, tags, location)
         {
             Properties = properties;
             ExtendedLocation = extendedLocation;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceAssetData"/> for deserialization. </summary>
-        internal DeviceRegistryNamespaceAssetData()
+        /// <summary> Initializes a new instance of <see cref="NamespaceAssetData"/> for deserialization. </summary>
+        internal NamespaceAssetData()
         {
         }
 
         /// <summary> The resource-specific properties for this resource. </summary>
-        public DeviceRegistryNamespaceAssetProperties Properties { get; set; }
+        public NamespaceAssetProperties Properties { get; set; }
         /// <summary> The extended location. </summary>
         public DeviceRegistryExtendedLocation ExtendedLocation { get; set; }
     }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceAssetResource.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceAssetResource.Serialization.cs
new file mode 100644
index 000000000000..e4c1b4f8033c
--- /dev/null
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceAssetResource.Serialization.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+
+namespace Azure.ResourceManager.DeviceRegistry
+{
+    public partial class NamespaceAssetResource : IJsonModel<NamespaceAssetData>
+    {
+        private static NamespaceAssetData s_dataDeserializationInstance;
+        private static NamespaceAssetData DataDeserializationInstance => s_dataDeserializationInstance ??= new();
+
+        void IJsonModel<NamespaceAssetData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<NamespaceAssetData>)Data).Write(writer, options);
+
+        NamespaceAssetData IJsonModel<NamespaceAssetData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => ((IJsonModel<NamespaceAssetData>)DataDeserializationInstance).Create(ref reader, options);
+
+        BinaryData IPersistableModel<NamespaceAssetData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<NamespaceAssetData>(Data, options, AzureResourceManagerDeviceRegistryContext.Default);
+
+        NamespaceAssetData IPersistableModel<NamespaceAssetData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<NamespaceAssetData>(data, options, AzureResourceManagerDeviceRegistryContext.Default);
+
+        string IPersistableModel<NamespaceAssetData>.GetFormatFromOptions(ModelReaderWriterOptions options) => ((IPersistableModel<NamespaceAssetData>)DataDeserializationInstance).GetFormatFromOptions(options);
+    }
+}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceAssetResource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceAssetResource.cs
similarity index 69%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceAssetResource.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceAssetResource.cs
index 62ba51eb5328..4477a6e9c7e3 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceAssetResource.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceAssetResource.cs
@@ -17,14 +17,14 @@
 namespace Azure.ResourceManager.DeviceRegistry
 {
     /// <summary>
-    /// A Class representing a DeviceRegistryNamespaceAsset along with the instance operations that can be performed on it.
-    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="DeviceRegistryNamespaceAssetResource"/>
-    /// from an instance of <see cref="ArmClient"/> using the GetDeviceRegistryNamespaceAssetResource method.
-    /// Otherwise you can get one from its parent resource <see cref="DeviceRegistryNamespaceResource"/> using the GetDeviceRegistryNamespaceAsset method.
+    /// A Class representing a NamespaceAsset along with the instance operations that can be performed on it.
+    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="NamespaceAssetResource"/>
+    /// from an instance of <see cref="ArmClient"/> using the GetNamespaceAssetResource method.
+    /// Otherwise you can get one from its parent resource <see cref="NamespaceResource"/> using the GetNamespaceAsset method.
     /// </summary>
-    public partial class DeviceRegistryNamespaceAssetResource : ArmResource
+    public partial class NamespaceAssetResource : ArmResource
     {
-        /// <summary> Generate the resource identifier of a <see cref="DeviceRegistryNamespaceAssetResource"/> instance. </summary>
+        /// <summary> Generate the resource identifier of a <see cref="NamespaceAssetResource"/> instance. </summary>
         /// <param name="subscriptionId"> The subscriptionId. </param>
         /// <param name="resourceGroupName"> The resourceGroupName. </param>
         /// <param name="namespaceName"> The namespaceName. </param>
@@ -35,35 +35,35 @@ public static ResourceIdentifier CreateResourceIdentifier(string subscriptionId,
             return new ResourceIdentifier(resourceId);
         }
 
-        private readonly ClientDiagnostics _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics;
-        private readonly NamespaceAssetsRestOperations _deviceRegistryNamespaceAssetNamespaceAssetsRestClient;
-        private readonly DeviceRegistryNamespaceAssetData _data;
+        private readonly ClientDiagnostics _namespaceAssetClientDiagnostics;
+        private readonly NamespaceAssetsRestOperations _namespaceAssetRestClient;
+        private readonly NamespaceAssetData _data;
 
         /// <summary> Gets the resource type for the operations. </summary>
         public static readonly ResourceType ResourceType = "Microsoft.DeviceRegistry/namespaces/assets";
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceAssetResource"/> class for mocking. </summary>
-        protected DeviceRegistryNamespaceAssetResource()
+        /// <summary> Initializes a new instance of the <see cref="NamespaceAssetResource"/> class for mocking. </summary>
+        protected NamespaceAssetResource()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceAssetResource"/> class. </summary>
+        /// <summary> Initializes a new instance of the <see cref="NamespaceAssetResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="data"> The resource that is the target of operations. </param>
-        internal DeviceRegistryNamespaceAssetResource(ArmClient client, DeviceRegistryNamespaceAssetData data) : this(client, data.Id)
+        internal NamespaceAssetResource(ArmClient client, NamespaceAssetData data) : this(client, data.Id)
         {
             HasData = true;
             _data = data;
         }
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceAssetResource"/> class. </summary>
+        /// <summary> Initializes a new instance of the <see cref="NamespaceAssetResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the resource that is the target of operations. </param>
-        internal DeviceRegistryNamespaceAssetResource(ArmClient client, ResourceIdentifier id) : base(client, id)
+        internal NamespaceAssetResource(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(ResourceType, out string deviceRegistryNamespaceAssetNamespaceAssetsApiVersion);
-            _deviceRegistryNamespaceAssetNamespaceAssetsRestClient = new NamespaceAssetsRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, deviceRegistryNamespaceAssetNamespaceAssetsApiVersion);
+            _namespaceAssetClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", ResourceType.Namespace, Diagnostics);
+            TryGetApiVersion(ResourceType, out string namespaceAssetApiVersion);
+            _namespaceAssetRestClient = new NamespaceAssetsRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, namespaceAssetApiVersion);
 #if DEBUG
 			ValidateResourceId(Id);
 #endif
@@ -74,7 +74,7 @@ internal DeviceRegistryNamespaceAssetResource(ArmClient client, ResourceIdentifi
 
         /// <summary> Gets the data representing this Feature. </summary>
         /// <exception cref="InvalidOperationException"> Throws if there is no data loaded in the current instance. </exception>
-        public virtual DeviceRegistryNamespaceAssetData Data
+        public virtual NamespaceAssetData Data
         {
             get
             {
@@ -107,21 +107,21 @@ internal static void ValidateResourceId(ResourceIdentifier id)
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> GetAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceAssetResource>> GetAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetResource.Get");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetResource.Get");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceAssetRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceAssetResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceAssetResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -147,21 +147,21 @@ public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> GetAsy
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual Response<DeviceRegistryNamespaceAssetResource> Get(CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceAssetResource> Get(CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetResource.Get");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetResource.Get");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                var response = _namespaceAssetRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceAssetResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceAssetResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -187,7 +187,7 @@ public virtual Response<DeviceRegistryNamespaceAssetResource> Get(CancellationTo
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -195,12 +195,12 @@ public virtual Response<DeviceRegistryNamespaceAssetResource> Get(CancellationTo
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<ArmOperation> DeleteAsync(WaitUntil waitUntil, CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetResource.Delete");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetResource.Delete");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.DeleteAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation(_deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics, Pipeline, _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
+                var response = await _namespaceAssetRestClient.DeleteAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation(_namespaceAssetClientDiagnostics, Pipeline, _namespaceAssetRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionResponseAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -229,7 +229,7 @@ public virtual async Task<ArmOperation> DeleteAsync(WaitUntil waitUntil, Cancell
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -237,12 +237,12 @@ public virtual async Task<ArmOperation> DeleteAsync(WaitUntil waitUntil, Cancell
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetResource.Delete");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetResource.Delete");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.Delete(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                var operation = new DeviceRegistryArmOperation(_deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics, Pipeline, _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
+                var response = _namespaceAssetRestClient.Delete(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                var operation = new DeviceRegistryArmOperation(_namespaceAssetClientDiagnostics, Pipeline, _namespaceAssetRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletionResponse(cancellationToken);
                 return operation;
@@ -271,7 +271,7 @@ public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancel
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -279,16 +279,16 @@ public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancel
         /// <param name="patch"> The resource properties to be updated. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="patch"/> is null. </exception>
-        public virtual async Task<ArmOperation<DeviceRegistryNamespaceAssetResource>> UpdateAsync(WaitUntil waitUntil, DeviceRegistryNamespaceAssetPatch patch, CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<NamespaceAssetResource>> UpdateAsync(WaitUntil waitUntil, NamespaceAssetPatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(patch, nameof(patch));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetResource.Update");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetResource.Update");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceAssetResource>(new DeviceRegistryNamespaceAssetOperationSource(Client), _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics, Pipeline, _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
+                var response = await _namespaceAssetRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation<NamespaceAssetResource>(new NamespaceAssetOperationSource(Client), _namespaceAssetClientDiagnostics, Pipeline, _namespaceAssetRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -317,7 +317,7 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceAssetResource>> Up
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -325,16 +325,16 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceAssetResource>> Up
         /// <param name="patch"> The resource properties to be updated. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="patch"/> is null. </exception>
-        public virtual ArmOperation<DeviceRegistryNamespaceAssetResource> Update(WaitUntil waitUntil, DeviceRegistryNamespaceAssetPatch patch, CancellationToken cancellationToken = default)
+        public virtual ArmOperation<NamespaceAssetResource> Update(WaitUntil waitUntil, NamespaceAssetPatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(patch, nameof(patch));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetResource.Update");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetResource.Update");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceAssetResource>(new DeviceRegistryNamespaceAssetOperationSource(Client), _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics, Pipeline, _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
+                var response = _namespaceAssetRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken);
+                var operation = new DeviceRegistryArmOperation<NamespaceAssetResource>(new NamespaceAssetOperationSource(Client), _namespaceAssetClientDiagnostics, Pipeline, _namespaceAssetRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletion(cancellationToken);
                 return operation;
@@ -363,7 +363,7 @@ public virtual ArmOperation<DeviceRegistryNamespaceAssetResource> Update(WaitUnt
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -371,12 +371,12 @@ public virtual ArmOperation<DeviceRegistryNamespaceAssetResource> Update(WaitUnt
         /// <param name="value"> The value for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> or <paramref name="value"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> AddTagAsync(string key, string value, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceAssetResource>> AddTagAsync(string key, string value, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
             Argument.AssertNotNull(value, nameof(value));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetResource.AddTag");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetResource.AddTag");
             scope.Start();
             try
             {
@@ -385,13 +385,13 @@ public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> AddTag
                     var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false);
                     originalTags.Value.Data.TagValues[key] = value;
                     await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    var originalResponse = await _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                    return Response.FromValue(new DeviceRegistryNamespaceAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = await _namespaceAssetRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                    return Response.FromValue(new NamespaceAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = (await GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false)).Value.Data;
-                    var patch = new DeviceRegistryNamespaceAssetPatch();
+                    var patch = new NamespaceAssetPatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
@@ -425,7 +425,7 @@ public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> AddTag
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -433,12 +433,12 @@ public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> AddTag
         /// <param name="value"> The value for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> or <paramref name="value"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceAssetResource> AddTag(string key, string value, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceAssetResource> AddTag(string key, string value, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
             Argument.AssertNotNull(value, nameof(value));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetResource.AddTag");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetResource.AddTag");
             scope.Start();
             try
             {
@@ -447,13 +447,13 @@ public virtual Response<DeviceRegistryNamespaceAssetResource> AddTag(string key,
                     var originalTags = GetTagResource().Get(cancellationToken);
                     originalTags.Value.Data.TagValues[key] = value;
                     GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken);
-                    var originalResponse = _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                    return Response.FromValue(new DeviceRegistryNamespaceAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = _namespaceAssetRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                    return Response.FromValue(new NamespaceAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = Get(cancellationToken: cancellationToken).Value.Data;
-                    var patch = new DeviceRegistryNamespaceAssetPatch();
+                    var patch = new NamespaceAssetPatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
@@ -487,18 +487,18 @@ public virtual Response<DeviceRegistryNamespaceAssetResource> AddTag(string key,
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="tags"> The set of tags to use as replacement. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="tags"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> SetTagsAsync(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceAssetResource>> SetTagsAsync(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(tags, nameof(tags));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetResource.SetTags");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetResource.SetTags");
             scope.Start();
             try
             {
@@ -508,13 +508,13 @@ public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> SetTag
                     var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false);
                     originalTags.Value.Data.TagValues.ReplaceWith(tags);
                     await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    var originalResponse = await _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                    return Response.FromValue(new DeviceRegistryNamespaceAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = await _namespaceAssetRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                    return Response.FromValue(new NamespaceAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = (await GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false)).Value.Data;
-                    var patch = new DeviceRegistryNamespaceAssetPatch();
+                    var patch = new NamespaceAssetPatch();
                     patch.Tags.ReplaceWith(tags);
                     var result = await UpdateAsync(WaitUntil.Completed, patch, cancellationToken: cancellationToken).ConfigureAwait(false);
                     return Response.FromValue(result.Value, result.GetRawResponse());
@@ -544,18 +544,18 @@ public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> SetTag
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="tags"> The set of tags to use as replacement. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="tags"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceAssetResource> SetTags(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceAssetResource> SetTags(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(tags, nameof(tags));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetResource.SetTags");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetResource.SetTags");
             scope.Start();
             try
             {
@@ -565,13 +565,13 @@ public virtual Response<DeviceRegistryNamespaceAssetResource> SetTags(IDictionar
                     var originalTags = GetTagResource().Get(cancellationToken);
                     originalTags.Value.Data.TagValues.ReplaceWith(tags);
                     GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken);
-                    var originalResponse = _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                    return Response.FromValue(new DeviceRegistryNamespaceAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = _namespaceAssetRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                    return Response.FromValue(new NamespaceAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = Get(cancellationToken: cancellationToken).Value.Data;
-                    var patch = new DeviceRegistryNamespaceAssetPatch();
+                    var patch = new NamespaceAssetPatch();
                     patch.Tags.ReplaceWith(tags);
                     var result = Update(WaitUntil.Completed, patch, cancellationToken: cancellationToken);
                     return Response.FromValue(result.Value, result.GetRawResponse());
@@ -601,18 +601,18 @@ public virtual Response<DeviceRegistryNamespaceAssetResource> SetTags(IDictionar
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="key"> The key for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> RemoveTagAsync(string key, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceAssetResource>> RemoveTagAsync(string key, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetResource.RemoveTag");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetResource.RemoveTag");
             scope.Start();
             try
             {
@@ -621,13 +621,13 @@ public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> Remove
                     var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false);
                     originalTags.Value.Data.TagValues.Remove(key);
                     await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    var originalResponse = await _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                    return Response.FromValue(new DeviceRegistryNamespaceAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = await _namespaceAssetRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                    return Response.FromValue(new NamespaceAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = (await GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false)).Value.Data;
-                    var patch = new DeviceRegistryNamespaceAssetPatch();
+                    var patch = new NamespaceAssetPatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
@@ -661,18 +661,18 @@ public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> Remove
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="key"> The key for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceAssetResource> RemoveTag(string key, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceAssetResource> RemoveTag(string key, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
 
-            using var scope = _deviceRegistryNamespaceAssetNamespaceAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceAssetResource.RemoveTag");
+            using var scope = _namespaceAssetClientDiagnostics.CreateScope("NamespaceAssetResource.RemoveTag");
             scope.Start();
             try
             {
@@ -681,13 +681,13 @@ public virtual Response<DeviceRegistryNamespaceAssetResource> RemoveTag(string k
                     var originalTags = GetTagResource().Get(cancellationToken);
                     originalTags.Value.Data.TagValues.Remove(key);
                     GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken);
-                    var originalResponse = _deviceRegistryNamespaceAssetNamespaceAssetsRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                    return Response.FromValue(new DeviceRegistryNamespaceAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = _namespaceAssetRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                    return Response.FromValue(new NamespaceAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = Get(cancellationToken: cancellationToken).Value.Data;
-                    var patch = new DeviceRegistryNamespaceAssetPatch();
+                    var patch = new NamespaceAssetPatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceCollection.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceCollection.cs
similarity index 64%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceCollection.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceCollection.cs
index d48f0b7c4893..03e45fbd95c2 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceCollection.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceCollection.cs
@@ -19,28 +19,28 @@
 namespace Azure.ResourceManager.DeviceRegistry
 {
     /// <summary>
-    /// A class representing a collection of <see cref="DeviceRegistryNamespaceResource"/> and their operations.
-    /// Each <see cref="DeviceRegistryNamespaceResource"/> in the collection will belong to the same instance of <see cref="ResourceGroupResource"/>.
-    /// To get a <see cref="DeviceRegistryNamespaceCollection"/> instance call the GetDeviceRegistryNamespaces method from an instance of <see cref="ResourceGroupResource"/>.
+    /// A class representing a collection of <see cref="NamespaceResource"/> and their operations.
+    /// Each <see cref="NamespaceResource"/> in the collection will belong to the same instance of <see cref="ResourceGroupResource"/>.
+    /// To get a <see cref="NamespaceCollection"/> instance call the GetNamespaces method from an instance of <see cref="ResourceGroupResource"/>.
     /// </summary>
-    public partial class DeviceRegistryNamespaceCollection : ArmCollection, IEnumerable<DeviceRegistryNamespaceResource>, IAsyncEnumerable<DeviceRegistryNamespaceResource>
+    public partial class NamespaceCollection : ArmCollection, IEnumerable<NamespaceResource>, IAsyncEnumerable<NamespaceResource>
     {
-        private readonly ClientDiagnostics _deviceRegistryNamespaceNamespacesClientDiagnostics;
-        private readonly NamespacesRestOperations _deviceRegistryNamespaceNamespacesRestClient;
+        private readonly ClientDiagnostics _namespaceClientDiagnostics;
+        private readonly NamespacesRestOperations _namespaceRestClient;
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceCollection"/> class for mocking. </summary>
-        protected DeviceRegistryNamespaceCollection()
+        /// <summary> Initializes a new instance of the <see cref="NamespaceCollection"/> class for mocking. </summary>
+        protected NamespaceCollection()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceCollection"/> class. </summary>
+        /// <summary> Initializes a new instance of the <see cref="NamespaceCollection"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the parent resource that is the target of operations. </param>
-        internal DeviceRegistryNamespaceCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
+        internal NamespaceCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _deviceRegistryNamespaceNamespacesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", DeviceRegistryNamespaceResource.ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(DeviceRegistryNamespaceResource.ResourceType, out string deviceRegistryNamespaceNamespacesApiVersion);
-            _deviceRegistryNamespaceNamespacesRestClient = new NamespacesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, deviceRegistryNamespaceNamespacesApiVersion);
+            _namespaceClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", NamespaceResource.ResourceType.Namespace, Diagnostics);
+            TryGetApiVersion(NamespaceResource.ResourceType, out string namespaceApiVersion);
+            _namespaceRestClient = new NamespacesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, namespaceApiVersion);
 #if DEBUG
 			ValidateResourceId(Id);
 #endif
@@ -69,7 +69,7 @@ internal static void ValidateResourceId(ResourceIdentifier id)
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -79,17 +79,17 @@ internal static void ValidateResourceId(ResourceIdentifier id)
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="namespaceName"/> or <paramref name="data"/> is null. </exception>
-        public virtual async Task<ArmOperation<DeviceRegistryNamespaceResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string namespaceName, DeviceRegistryNamespaceData data, CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<NamespaceResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string namespaceName, NamespaceData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(namespaceName, nameof(namespaceName));
             Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceCollection.CreateOrUpdate");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceNamespacesRestClient.CreateOrReplaceAsync(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, data, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceResource>(new DeviceRegistryNamespaceOperationSource(Client), _deviceRegistryNamespaceNamespacesClientDiagnostics, Pipeline, _deviceRegistryNamespaceNamespacesRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                var response = await _namespaceRestClient.CreateOrReplaceAsync(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, data, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation<NamespaceResource>(new NamespaceOperationSource(Client), _namespaceClientDiagnostics, Pipeline, _namespaceRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -118,7 +118,7 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceResource>> CreateO
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -128,17 +128,17 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceResource>> CreateO
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="namespaceName"/> or <paramref name="data"/> is null. </exception>
-        public virtual ArmOperation<DeviceRegistryNamespaceResource> CreateOrUpdate(WaitUntil waitUntil, string namespaceName, DeviceRegistryNamespaceData data, CancellationToken cancellationToken = default)
+        public virtual ArmOperation<NamespaceResource> CreateOrUpdate(WaitUntil waitUntil, string namespaceName, NamespaceData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(namespaceName, nameof(namespaceName));
             Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceCollection.CreateOrUpdate");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceNamespacesRestClient.CreateOrReplace(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, data, cancellationToken);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceResource>(new DeviceRegistryNamespaceOperationSource(Client), _deviceRegistryNamespaceNamespacesClientDiagnostics, Pipeline, _deviceRegistryNamespaceNamespacesRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                var response = _namespaceRestClient.CreateOrReplace(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, data, cancellationToken);
+                var operation = new DeviceRegistryArmOperation<NamespaceResource>(new NamespaceOperationSource(Client), _namespaceClientDiagnostics, Pipeline, _namespaceRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletion(cancellationToken);
                 return operation;
@@ -167,7 +167,7 @@ public virtual ArmOperation<DeviceRegistryNamespaceResource> CreateOrUpdate(Wait
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -175,18 +175,18 @@ public virtual ArmOperation<DeviceRegistryNamespaceResource> CreateOrUpdate(Wait
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="namespaceName"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceResource>> GetAsync(string namespaceName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceResource>> GetAsync(string namespaceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(namespaceName, nameof(namespaceName));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceCollection.Get");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceCollection.Get");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceNamespacesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, cancellationToken).ConfigureAwait(false);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -212,7 +212,7 @@ public virtual async Task<Response<DeviceRegistryNamespaceResource>> GetAsync(st
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -220,18 +220,18 @@ public virtual async Task<Response<DeviceRegistryNamespaceResource>> GetAsync(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="namespaceName"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceResource> Get(string namespaceName, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceResource> Get(string namespaceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(namespaceName, nameof(namespaceName));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceCollection.Get");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceCollection.Get");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceNamespacesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, cancellationToken);
+                var response = _namespaceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, cancellationToken);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -257,17 +257,17 @@ public virtual Response<DeviceRegistryNamespaceResource> Get(string namespaceNam
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> An async collection of <see cref="DeviceRegistryNamespaceResource"/> that may take multiple service requests to iterate over. </returns>
-        public virtual AsyncPageable<DeviceRegistryNamespaceResource> GetAllAsync(CancellationToken cancellationToken = default)
+        /// <returns> An async collection of <see cref="NamespaceResource"/> that may take multiple service requests to iterate over. </returns>
+        public virtual AsyncPageable<NamespaceResource> GetAllAsync(CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => _deviceRegistryNamespaceNamespacesRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _deviceRegistryNamespaceNamespacesRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName);
-            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new DeviceRegistryNamespaceResource(Client, DeviceRegistryNamespaceData.DeserializeDeviceRegistryNamespaceData(e)), _deviceRegistryNamespaceNamespacesClientDiagnostics, Pipeline, "DeviceRegistryNamespaceCollection.GetAll", "value", "nextLink", cancellationToken);
+            HttpMessage FirstPageRequest(int? pageSizeHint) => _namespaceRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName);
+            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _namespaceRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName);
+            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new NamespaceResource(Client, NamespaceData.DeserializeNamespaceData(e)), _namespaceClientDiagnostics, Pipeline, "NamespaceCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -287,17 +287,17 @@ public virtual AsyncPageable<DeviceRegistryNamespaceResource> GetAllAsync(Cancel
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> A collection of <see cref="DeviceRegistryNamespaceResource"/> that may take multiple service requests to iterate over. </returns>
-        public virtual Pageable<DeviceRegistryNamespaceResource> GetAll(CancellationToken cancellationToken = default)
+        /// <returns> A collection of <see cref="NamespaceResource"/> that may take multiple service requests to iterate over. </returns>
+        public virtual Pageable<NamespaceResource> GetAll(CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => _deviceRegistryNamespaceNamespacesRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _deviceRegistryNamespaceNamespacesRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName);
-            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new DeviceRegistryNamespaceResource(Client, DeviceRegistryNamespaceData.DeserializeDeviceRegistryNamespaceData(e)), _deviceRegistryNamespaceNamespacesClientDiagnostics, Pipeline, "DeviceRegistryNamespaceCollection.GetAll", "value", "nextLink", cancellationToken);
+            HttpMessage FirstPageRequest(int? pageSizeHint) => _namespaceRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName);
+            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _namespaceRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName);
+            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new NamespaceResource(Client, NamespaceData.DeserializeNamespaceData(e)), _namespaceClientDiagnostics, Pipeline, "NamespaceCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -317,7 +317,7 @@ public virtual Pageable<DeviceRegistryNamespaceResource> GetAll(CancellationToke
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -329,11 +329,11 @@ public virtual async Task<Response<bool>> ExistsAsync(string namespaceName, Canc
         {
             Argument.AssertNotNullOrEmpty(namespaceName, nameof(namespaceName));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceCollection.Exists");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceCollection.Exists");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceNamespacesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, cancellationToken: cancellationToken).ConfigureAwait(false);
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -360,7 +360,7 @@ public virtual async Task<Response<bool>> ExistsAsync(string namespaceName, Canc
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -372,11 +372,11 @@ public virtual Response<bool> Exists(string namespaceName, CancellationToken can
         {
             Argument.AssertNotNullOrEmpty(namespaceName, nameof(namespaceName));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceCollection.Exists");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceCollection.Exists");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceNamespacesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, cancellationToken: cancellationToken);
+                var response = _namespaceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, cancellationToken: cancellationToken);
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -403,7 +403,7 @@ public virtual Response<bool> Exists(string namespaceName, CancellationToken can
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -411,18 +411,18 @@ public virtual Response<bool> Exists(string namespaceName, CancellationToken can
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="namespaceName"/> is null. </exception>
-        public virtual async Task<NullableResponse<DeviceRegistryNamespaceResource>> GetIfExistsAsync(string namespaceName, CancellationToken cancellationToken = default)
+        public virtual async Task<NullableResponse<NamespaceResource>> GetIfExistsAsync(string namespaceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(namespaceName, nameof(namespaceName));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceCollection.GetIfExists");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceNamespacesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, cancellationToken: cancellationToken).ConfigureAwait(false);
                 if (response.Value == null)
-                    return new NoValueResponse<DeviceRegistryNamespaceResource>(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceResource(Client, response.Value), response.GetRawResponse());
+                    return new NoValueResponse<NamespaceResource>(response.GetRawResponse());
+                return Response.FromValue(new NamespaceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -448,7 +448,7 @@ public virtual async Task<NullableResponse<DeviceRegistryNamespaceResource>> Get
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -456,18 +456,18 @@ public virtual async Task<NullableResponse<DeviceRegistryNamespaceResource>> Get
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="namespaceName"/> is null. </exception>
-        public virtual NullableResponse<DeviceRegistryNamespaceResource> GetIfExists(string namespaceName, CancellationToken cancellationToken = default)
+        public virtual NullableResponse<NamespaceResource> GetIfExists(string namespaceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(namespaceName, nameof(namespaceName));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceCollection.GetIfExists");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceNamespacesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, cancellationToken: cancellationToken);
+                var response = _namespaceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, namespaceName, cancellationToken: cancellationToken);
                 if (response.Value == null)
-                    return new NoValueResponse<DeviceRegistryNamespaceResource>(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceResource(Client, response.Value), response.GetRawResponse());
+                    return new NoValueResponse<NamespaceResource>(response.GetRawResponse());
+                return Response.FromValue(new NamespaceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -476,7 +476,7 @@ public virtual NullableResponse<DeviceRegistryNamespaceResource> GetIfExists(str
             }
         }
 
-        IEnumerator<DeviceRegistryNamespaceResource> IEnumerable<DeviceRegistryNamespaceResource>.GetEnumerator()
+        IEnumerator<NamespaceResource> IEnumerable<NamespaceResource>.GetEnumerator()
         {
             return GetAll().GetEnumerator();
         }
@@ -486,7 +486,7 @@ IEnumerator IEnumerable.GetEnumerator()
             return GetAll().GetEnumerator();
         }
 
-        IAsyncEnumerator<DeviceRegistryNamespaceResource> IAsyncEnumerable<DeviceRegistryNamespaceResource>.GetAsyncEnumerator(CancellationToken cancellationToken)
+        IAsyncEnumerator<NamespaceResource> IAsyncEnumerable<NamespaceResource>.GetAsyncEnumerator(CancellationToken cancellationToken)
         {
             return GetAllAsync(cancellationToken: cancellationToken).GetAsyncEnumerator(cancellationToken);
         }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceData.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceData.Serialization.cs
similarity index 74%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceData.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceData.Serialization.cs
index 8b13b34cea16..0528049e2977 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceData.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceData.Serialization.cs
@@ -16,11 +16,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry
 {
-    public partial class DeviceRegistryNamespaceData : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceData>
+    public partial class NamespaceData : IUtf8JsonSerializable, IJsonModel<NamespaceData>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -31,10 +31,10 @@ void IJsonModel<DeviceRegistryNamespaceData>.Write(Utf8JsonWriter writer, ModelR
         /// <param name="options"> The client options for reading and writing models. </param>
         protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceData)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceData)} does not support writing '{format}' format.");
             }
 
             base.JsonModelWriteCore(writer, options);
@@ -50,19 +50,19 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri
             }
         }
 
-        DeviceRegistryNamespaceData IJsonModel<DeviceRegistryNamespaceData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceData IJsonModel<NamespaceData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceData)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceData)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceData(document.RootElement, options);
+            return DeserializeNamespaceData(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceData DeserializeDeviceRegistryNamespaceData(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceData DeserializeNamespaceData(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -70,7 +70,7 @@ internal static DeviceRegistryNamespaceData DeserializeDeviceRegistryNamespaceDa
             {
                 return null;
             }
-            DeviceRegistryNamespaceProperties properties = default;
+            NamespaceProperties properties = default;
             ManagedServiceIdentity identity = default;
             IDictionary<string, string> tags = default;
             AzureLocation location = default;
@@ -88,7 +88,7 @@ internal static DeviceRegistryNamespaceData DeserializeDeviceRegistryNamespaceDa
                     {
                         continue;
                     }
-                    properties = DeviceRegistryNamespaceProperties.DeserializeDeviceRegistryNamespaceProperties(property.Value, options);
+                    properties = NamespaceProperties.DeserializeNamespaceProperties(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("identity"u8))
@@ -149,7 +149,7 @@ internal static DeviceRegistryNamespaceData DeserializeDeviceRegistryNamespaceDa
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceData(
+            return new NamespaceData(
                 id,
                 name,
                 type,
@@ -161,35 +161,35 @@ internal static DeviceRegistryNamespaceData DeserializeDeviceRegistryNamespaceDa
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceData>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceData>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceData>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceData)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceData)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceData IPersistableModel<DeviceRegistryNamespaceData>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceData IPersistableModel<NamespaceData>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceData>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceData(document.RootElement, options);
+                        return DeserializeNamespaceData(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceData)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceData)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceData.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceData.cs
similarity index 74%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceData.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceData.cs
index 8769b03b4eda..c1256fc96119 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceData.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceData.cs
@@ -14,10 +14,10 @@
 namespace Azure.ResourceManager.DeviceRegistry
 {
     /// <summary>
-    /// A class representing the DeviceRegistryNamespace data model.
+    /// A class representing the Namespace data model.
     /// Namespace definition.
     /// </summary>
-    public partial class DeviceRegistryNamespaceData : TrackedResourceData
+    public partial class NamespaceData : TrackedResourceData
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -51,13 +51,13 @@ public partial class DeviceRegistryNamespaceData : TrackedResourceData
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceData"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceData"/>. </summary>
         /// <param name="location"> The location. </param>
-        public DeviceRegistryNamespaceData(AzureLocation location) : base(location)
+        public NamespaceData(AzureLocation location) : base(location)
         {
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceData"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceData"/>. </summary>
         /// <param name="id"> The id. </param>
         /// <param name="name"> The name. </param>
         /// <param name="resourceType"> The resourceType. </param>
@@ -67,20 +67,20 @@ public DeviceRegistryNamespaceData(AzureLocation location) : base(location)
         /// <param name="properties"> The resource-specific properties for this resource. </param>
         /// <param name="identity"> The managed service identities assigned to this resource. Current supported identity types: None, SystemAssigned. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, string> tags, AzureLocation location, DeviceRegistryNamespaceProperties properties, ManagedServiceIdentity identity, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData, tags, location)
+        internal NamespaceData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, string> tags, AzureLocation location, NamespaceProperties properties, ManagedServiceIdentity identity, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData, tags, location)
         {
             Properties = properties;
             Identity = identity;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceData"/> for deserialization. </summary>
-        internal DeviceRegistryNamespaceData()
+        /// <summary> Initializes a new instance of <see cref="NamespaceData"/> for deserialization. </summary>
+        internal NamespaceData()
         {
         }
 
         /// <summary> The resource-specific properties for this resource. </summary>
-        public DeviceRegistryNamespaceProperties Properties { get; set; }
+        public NamespaceProperties Properties { get; set; }
         /// <summary> The managed service identities assigned to this resource. Current supported identity types: None, SystemAssigned. </summary>
         public ManagedServiceIdentity Identity { get; set; }
     }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDeviceCollection.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDeviceCollection.cs
similarity index 62%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDeviceCollection.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDeviceCollection.cs
index 5d798334c6f6..1a1d2cceed2d 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDeviceCollection.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDeviceCollection.cs
@@ -18,28 +18,28 @@
 namespace Azure.ResourceManager.DeviceRegistry
 {
     /// <summary>
-    /// A class representing a collection of <see cref="DeviceRegistryNamespaceDeviceResource"/> and their operations.
-    /// Each <see cref="DeviceRegistryNamespaceDeviceResource"/> in the collection will belong to the same instance of <see cref="DeviceRegistryNamespaceResource"/>.
-    /// To get a <see cref="DeviceRegistryNamespaceDeviceCollection"/> instance call the GetDeviceRegistryNamespaceDevices method from an instance of <see cref="DeviceRegistryNamespaceResource"/>.
+    /// A class representing a collection of <see cref="NamespaceDeviceResource"/> and their operations.
+    /// Each <see cref="NamespaceDeviceResource"/> in the collection will belong to the same instance of <see cref="NamespaceResource"/>.
+    /// To get a <see cref="NamespaceDeviceCollection"/> instance call the GetNamespaceDevices method from an instance of <see cref="NamespaceResource"/>.
     /// </summary>
-    public partial class DeviceRegistryNamespaceDeviceCollection : ArmCollection, IEnumerable<DeviceRegistryNamespaceDeviceResource>, IAsyncEnumerable<DeviceRegistryNamespaceDeviceResource>
+    public partial class NamespaceDeviceCollection : ArmCollection, IEnumerable<NamespaceDeviceResource>, IAsyncEnumerable<NamespaceDeviceResource>
     {
-        private readonly ClientDiagnostics _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics;
-        private readonly NamespaceDevicesRestOperations _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient;
+        private readonly ClientDiagnostics _namespaceDeviceClientDiagnostics;
+        private readonly NamespaceDevicesRestOperations _namespaceDeviceRestClient;
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceDeviceCollection"/> class for mocking. </summary>
-        protected DeviceRegistryNamespaceDeviceCollection()
+        /// <summary> Initializes a new instance of the <see cref="NamespaceDeviceCollection"/> class for mocking. </summary>
+        protected NamespaceDeviceCollection()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceDeviceCollection"/> class. </summary>
+        /// <summary> Initializes a new instance of the <see cref="NamespaceDeviceCollection"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the parent resource that is the target of operations. </param>
-        internal DeviceRegistryNamespaceDeviceCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
+        internal NamespaceDeviceCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", DeviceRegistryNamespaceDeviceResource.ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(DeviceRegistryNamespaceDeviceResource.ResourceType, out string deviceRegistryNamespaceDeviceNamespaceDevicesApiVersion);
-            _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient = new NamespaceDevicesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, deviceRegistryNamespaceDeviceNamespaceDevicesApiVersion);
+            _namespaceDeviceClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", NamespaceDeviceResource.ResourceType.Namespace, Diagnostics);
+            TryGetApiVersion(NamespaceDeviceResource.ResourceType, out string namespaceDeviceApiVersion);
+            _namespaceDeviceRestClient = new NamespaceDevicesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, namespaceDeviceApiVersion);
 #if DEBUG
 			ValidateResourceId(Id);
 #endif
@@ -47,8 +47,8 @@ internal DeviceRegistryNamespaceDeviceCollection(ArmClient client, ResourceIdent
 
         internal static void ValidateResourceId(ResourceIdentifier id)
         {
-            if (id.ResourceType != DeviceRegistryNamespaceResource.ResourceType)
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, "Invalid resource type {0} expected {1}", id.ResourceType, DeviceRegistryNamespaceResource.ResourceType), nameof(id));
+            if (id.ResourceType != NamespaceResource.ResourceType)
+                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, "Invalid resource type {0} expected {1}", id.ResourceType, NamespaceResource.ResourceType), nameof(id));
         }
 
         /// <summary>
@@ -68,7 +68,7 @@ internal static void ValidateResourceId(ResourceIdentifier id)
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -78,17 +78,17 @@ internal static void ValidateResourceId(ResourceIdentifier id)
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="deviceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="deviceName"/> or <paramref name="data"/> is null. </exception>
-        public virtual async Task<ArmOperation<DeviceRegistryNamespaceDeviceResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string deviceName, DeviceRegistryNamespaceDeviceData data, CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<NamespaceDeviceResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string deviceName, NamespaceDeviceData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(deviceName, nameof(deviceName));
             Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceCollection.CreateOrUpdate");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.CreateOrReplaceAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, data, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceDeviceResource>(new DeviceRegistryNamespaceDeviceOperationSource(Client), _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics, Pipeline, _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                var response = await _namespaceDeviceRestClient.CreateOrReplaceAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, data, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation<NamespaceDeviceResource>(new NamespaceDeviceOperationSource(Client), _namespaceDeviceClientDiagnostics, Pipeline, _namespaceDeviceRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -117,7 +117,7 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceDeviceResource>> C
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -127,17 +127,17 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceDeviceResource>> C
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="deviceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="deviceName"/> or <paramref name="data"/> is null. </exception>
-        public virtual ArmOperation<DeviceRegistryNamespaceDeviceResource> CreateOrUpdate(WaitUntil waitUntil, string deviceName, DeviceRegistryNamespaceDeviceData data, CancellationToken cancellationToken = default)
+        public virtual ArmOperation<NamespaceDeviceResource> CreateOrUpdate(WaitUntil waitUntil, string deviceName, NamespaceDeviceData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(deviceName, nameof(deviceName));
             Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceCollection.CreateOrUpdate");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.CreateOrReplace(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, data, cancellationToken);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceDeviceResource>(new DeviceRegistryNamespaceDeviceOperationSource(Client), _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics, Pipeline, _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                var response = _namespaceDeviceRestClient.CreateOrReplace(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, data, cancellationToken);
+                var operation = new DeviceRegistryArmOperation<NamespaceDeviceResource>(new NamespaceDeviceOperationSource(Client), _namespaceDeviceClientDiagnostics, Pipeline, _namespaceDeviceRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletion(cancellationToken);
                 return operation;
@@ -166,7 +166,7 @@ public virtual ArmOperation<DeviceRegistryNamespaceDeviceResource> CreateOrUpdat
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -174,18 +174,18 @@ public virtual ArmOperation<DeviceRegistryNamespaceDeviceResource> CreateOrUpdat
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="deviceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="deviceName"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> GetAsync(string deviceName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDeviceResource>> GetAsync(string deviceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(deviceName, nameof(deviceName));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceCollection.Get");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceCollection.Get");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceDeviceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, cancellationToken).ConfigureAwait(false);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDeviceResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceDeviceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -211,7 +211,7 @@ public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> GetAs
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -219,18 +219,18 @@ public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> GetAs
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="deviceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="deviceName"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceDeviceResource> Get(string deviceName, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDeviceResource> Get(string deviceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(deviceName, nameof(deviceName));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceCollection.Get");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceCollection.Get");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, cancellationToken);
+                var response = _namespaceDeviceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, cancellationToken);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDeviceResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceDeviceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -256,17 +256,17 @@ public virtual Response<DeviceRegistryNamespaceDeviceResource> Get(string device
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> An async collection of <see cref="DeviceRegistryNamespaceDeviceResource"/> that may take multiple service requests to iterate over. </returns>
-        public virtual AsyncPageable<DeviceRegistryNamespaceDeviceResource> GetAllAsync(CancellationToken cancellationToken = default)
+        /// <returns> An async collection of <see cref="NamespaceDeviceResource"/> that may take multiple service requests to iterate over. </returns>
+        public virtual AsyncPageable<NamespaceDeviceResource> GetAllAsync(CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new DeviceRegistryNamespaceDeviceResource(Client, DeviceRegistryNamespaceDeviceData.DeserializeDeviceRegistryNamespaceDeviceData(e)), _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics, Pipeline, "DeviceRegistryNamespaceDeviceCollection.GetAll", "value", "nextLink", cancellationToken);
+            HttpMessage FirstPageRequest(int? pageSizeHint) => _namespaceDeviceRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _namespaceDeviceRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new NamespaceDeviceResource(Client, NamespaceDeviceData.DeserializeNamespaceDeviceData(e)), _namespaceDeviceClientDiagnostics, Pipeline, "NamespaceDeviceCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -286,17 +286,17 @@ public virtual AsyncPageable<DeviceRegistryNamespaceDeviceResource> GetAllAsync(
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> A collection of <see cref="DeviceRegistryNamespaceDeviceResource"/> that may take multiple service requests to iterate over. </returns>
-        public virtual Pageable<DeviceRegistryNamespaceDeviceResource> GetAll(CancellationToken cancellationToken = default)
+        /// <returns> A collection of <see cref="NamespaceDeviceResource"/> that may take multiple service requests to iterate over. </returns>
+        public virtual Pageable<NamespaceDeviceResource> GetAll(CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new DeviceRegistryNamespaceDeviceResource(Client, DeviceRegistryNamespaceDeviceData.DeserializeDeviceRegistryNamespaceDeviceData(e)), _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics, Pipeline, "DeviceRegistryNamespaceDeviceCollection.GetAll", "value", "nextLink", cancellationToken);
+            HttpMessage FirstPageRequest(int? pageSizeHint) => _namespaceDeviceRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _namespaceDeviceRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new NamespaceDeviceResource(Client, NamespaceDeviceData.DeserializeNamespaceDeviceData(e)), _namespaceDeviceClientDiagnostics, Pipeline, "NamespaceDeviceCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -316,7 +316,7 @@ public virtual Pageable<DeviceRegistryNamespaceDeviceResource> GetAll(Cancellati
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -328,11 +328,11 @@ public virtual async Task<Response<bool>> ExistsAsync(string deviceName, Cancell
         {
             Argument.AssertNotNullOrEmpty(deviceName, nameof(deviceName));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceCollection.Exists");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceCollection.Exists");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceDeviceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, cancellationToken: cancellationToken).ConfigureAwait(false);
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -359,7 +359,7 @@ public virtual async Task<Response<bool>> ExistsAsync(string deviceName, Cancell
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -371,11 +371,11 @@ public virtual Response<bool> Exists(string deviceName, CancellationToken cancel
         {
             Argument.AssertNotNullOrEmpty(deviceName, nameof(deviceName));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceCollection.Exists");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceCollection.Exists");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, cancellationToken: cancellationToken);
+                var response = _namespaceDeviceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, cancellationToken: cancellationToken);
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -402,7 +402,7 @@ public virtual Response<bool> Exists(string deviceName, CancellationToken cancel
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -410,18 +410,18 @@ public virtual Response<bool> Exists(string deviceName, CancellationToken cancel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="deviceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="deviceName"/> is null. </exception>
-        public virtual async Task<NullableResponse<DeviceRegistryNamespaceDeviceResource>> GetIfExistsAsync(string deviceName, CancellationToken cancellationToken = default)
+        public virtual async Task<NullableResponse<NamespaceDeviceResource>> GetIfExistsAsync(string deviceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(deviceName, nameof(deviceName));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceCollection.GetIfExists");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceDeviceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, cancellationToken: cancellationToken).ConfigureAwait(false);
                 if (response.Value == null)
-                    return new NoValueResponse<DeviceRegistryNamespaceDeviceResource>(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDeviceResource(Client, response.Value), response.GetRawResponse());
+                    return new NoValueResponse<NamespaceDeviceResource>(response.GetRawResponse());
+                return Response.FromValue(new NamespaceDeviceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -447,7 +447,7 @@ public virtual async Task<NullableResponse<DeviceRegistryNamespaceDeviceResource
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -455,18 +455,18 @@ public virtual async Task<NullableResponse<DeviceRegistryNamespaceDeviceResource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="deviceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="deviceName"/> is null. </exception>
-        public virtual NullableResponse<DeviceRegistryNamespaceDeviceResource> GetIfExists(string deviceName, CancellationToken cancellationToken = default)
+        public virtual NullableResponse<NamespaceDeviceResource> GetIfExists(string deviceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(deviceName, nameof(deviceName));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceCollection.GetIfExists");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, cancellationToken: cancellationToken);
+                var response = _namespaceDeviceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, deviceName, cancellationToken: cancellationToken);
                 if (response.Value == null)
-                    return new NoValueResponse<DeviceRegistryNamespaceDeviceResource>(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDeviceResource(Client, response.Value), response.GetRawResponse());
+                    return new NoValueResponse<NamespaceDeviceResource>(response.GetRawResponse());
+                return Response.FromValue(new NamespaceDeviceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -475,7 +475,7 @@ public virtual NullableResponse<DeviceRegistryNamespaceDeviceResource> GetIfExis
             }
         }
 
-        IEnumerator<DeviceRegistryNamespaceDeviceResource> IEnumerable<DeviceRegistryNamespaceDeviceResource>.GetEnumerator()
+        IEnumerator<NamespaceDeviceResource> IEnumerable<NamespaceDeviceResource>.GetEnumerator()
         {
             return GetAll().GetEnumerator();
         }
@@ -485,7 +485,7 @@ IEnumerator IEnumerable.GetEnumerator()
             return GetAll().GetEnumerator();
         }
 
-        IAsyncEnumerator<DeviceRegistryNamespaceDeviceResource> IAsyncEnumerable<DeviceRegistryNamespaceDeviceResource>.GetAsyncEnumerator(CancellationToken cancellationToken)
+        IAsyncEnumerator<NamespaceDeviceResource> IAsyncEnumerable<NamespaceDeviceResource>.GetAsyncEnumerator(CancellationToken cancellationToken)
         {
             return GetAllAsync(cancellationToken: cancellationToken).GetAsyncEnumerator(cancellationToken);
         }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDeviceData.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDeviceData.Serialization.cs
similarity index 74%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDeviceData.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDeviceData.Serialization.cs
index 5b654728fccd..67a754600446 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDeviceData.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDeviceData.Serialization.cs
@@ -16,11 +16,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry
 {
-    public partial class DeviceRegistryNamespaceDeviceData : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceDeviceData>
+    public partial class NamespaceDeviceData : IUtf8JsonSerializable, IJsonModel<NamespaceDeviceData>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceDeviceData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceDeviceData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceDeviceData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceDeviceData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -31,10 +31,10 @@ void IJsonModel<DeviceRegistryNamespaceDeviceData>.Write(Utf8JsonWriter writer,
         /// <param name="options"> The client options for reading and writing models. </param>
         protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDeviceData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDeviceData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDeviceData)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDeviceData)} does not support writing '{format}' format.");
             }
 
             base.JsonModelWriteCore(writer, options);
@@ -55,19 +55,19 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri
             }
         }
 
-        DeviceRegistryNamespaceDeviceData IJsonModel<DeviceRegistryNamespaceDeviceData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceDeviceData IJsonModel<NamespaceDeviceData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDeviceData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDeviceData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDeviceData)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDeviceData)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceDeviceData(document.RootElement, options);
+            return DeserializeNamespaceDeviceData(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceDeviceData DeserializeDeviceRegistryNamespaceDeviceData(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceDeviceData DeserializeNamespaceDeviceData(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -75,7 +75,7 @@ internal static DeviceRegistryNamespaceDeviceData DeserializeDeviceRegistryNames
             {
                 return null;
             }
-            DeviceRegistryNamespaceDeviceProperties properties = default;
+            NamespaceDeviceProperties properties = default;
             string etag = default;
             DeviceRegistryExtendedLocation extendedLocation = default;
             IDictionary<string, string> tags = default;
@@ -94,7 +94,7 @@ internal static DeviceRegistryNamespaceDeviceData DeserializeDeviceRegistryNames
                     {
                         continue;
                     }
-                    properties = DeviceRegistryNamespaceDeviceProperties.DeserializeDeviceRegistryNamespaceDeviceProperties(property.Value, options);
+                    properties = NamespaceDeviceProperties.DeserializeNamespaceDeviceProperties(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("etag"u8))
@@ -160,7 +160,7 @@ internal static DeviceRegistryNamespaceDeviceData DeserializeDeviceRegistryNames
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceDeviceData(
+            return new NamespaceDeviceData(
                 id,
                 name,
                 type,
@@ -173,35 +173,35 @@ internal static DeviceRegistryNamespaceDeviceData DeserializeDeviceRegistryNames
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceDeviceData>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceDeviceData>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDeviceData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDeviceData>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDeviceData)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDeviceData)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceDeviceData IPersistableModel<DeviceRegistryNamespaceDeviceData>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceDeviceData IPersistableModel<NamespaceDeviceData>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDeviceData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDeviceData>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceDeviceData(document.RootElement, options);
+                        return DeserializeNamespaceDeviceData(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDeviceData)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDeviceData)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceDeviceData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceDeviceData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDeviceData.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDeviceData.cs
similarity index 72%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDeviceData.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDeviceData.cs
index b44fe5dd402c..2b5e0dad1107 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDeviceData.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDeviceData.cs
@@ -14,10 +14,10 @@
 namespace Azure.ResourceManager.DeviceRegistry
 {
     /// <summary>
-    /// A class representing the DeviceRegistryNamespaceDevice data model.
+    /// A class representing the NamespaceDevice data model.
     /// Device definition.
     /// </summary>
-    public partial class DeviceRegistryNamespaceDeviceData : TrackedResourceData
+    public partial class NamespaceDeviceData : TrackedResourceData
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -51,13 +51,13 @@ public partial class DeviceRegistryNamespaceDeviceData : TrackedResourceData
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDeviceData"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceDeviceData"/>. </summary>
         /// <param name="location"> The location. </param>
-        public DeviceRegistryNamespaceDeviceData(AzureLocation location) : base(location)
+        public NamespaceDeviceData(AzureLocation location) : base(location)
         {
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDeviceData"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceDeviceData"/>. </summary>
         /// <param name="id"> The id. </param>
         /// <param name="name"> The name. </param>
         /// <param name="resourceType"> The resourceType. </param>
@@ -68,7 +68,7 @@ public DeviceRegistryNamespaceDeviceData(AzureLocation location) : base(location
         /// <param name="etag"> Resource Tag. </param>
         /// <param name="extendedLocation"> The extended location. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceDeviceData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, string> tags, AzureLocation location, DeviceRegistryNamespaceDeviceProperties properties, string etag, DeviceRegistryExtendedLocation extendedLocation, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData, tags, location)
+        internal NamespaceDeviceData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, string> tags, AzureLocation location, NamespaceDeviceProperties properties, string etag, DeviceRegistryExtendedLocation extendedLocation, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData, tags, location)
         {
             Properties = properties;
             ETag = etag;
@@ -76,13 +76,13 @@ internal DeviceRegistryNamespaceDeviceData(ResourceIdentifier id, string name, R
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDeviceData"/> for deserialization. </summary>
-        internal DeviceRegistryNamespaceDeviceData()
+        /// <summary> Initializes a new instance of <see cref="NamespaceDeviceData"/> for deserialization. </summary>
+        internal NamespaceDeviceData()
         {
         }
 
         /// <summary> The resource-specific properties for this resource. </summary>
-        public DeviceRegistryNamespaceDeviceProperties Properties { get; set; }
+        public NamespaceDeviceProperties Properties { get; set; }
         /// <summary> Resource Tag. </summary>
         public string ETag { get; }
         /// <summary> The extended location. </summary>
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDeviceResource.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDeviceResource.Serialization.cs
new file mode 100644
index 000000000000..89d5b9b1aaaf
--- /dev/null
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDeviceResource.Serialization.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+
+namespace Azure.ResourceManager.DeviceRegistry
+{
+    public partial class NamespaceDeviceResource : IJsonModel<NamespaceDeviceData>
+    {
+        private static NamespaceDeviceData s_dataDeserializationInstance;
+        private static NamespaceDeviceData DataDeserializationInstance => s_dataDeserializationInstance ??= new();
+
+        void IJsonModel<NamespaceDeviceData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<NamespaceDeviceData>)Data).Write(writer, options);
+
+        NamespaceDeviceData IJsonModel<NamespaceDeviceData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => ((IJsonModel<NamespaceDeviceData>)DataDeserializationInstance).Create(ref reader, options);
+
+        BinaryData IPersistableModel<NamespaceDeviceData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<NamespaceDeviceData>(Data, options, AzureResourceManagerDeviceRegistryContext.Default);
+
+        NamespaceDeviceData IPersistableModel<NamespaceDeviceData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<NamespaceDeviceData>(data, options, AzureResourceManagerDeviceRegistryContext.Default);
+
+        string IPersistableModel<NamespaceDeviceData>.GetFormatFromOptions(ModelReaderWriterOptions options) => ((IPersistableModel<NamespaceDeviceData>)DataDeserializationInstance).GetFormatFromOptions(options);
+    }
+}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDeviceResource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDeviceResource.cs
similarity index 69%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDeviceResource.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDeviceResource.cs
index e66941d1aa12..ee8fc13d1203 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDeviceResource.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDeviceResource.cs
@@ -17,14 +17,14 @@
 namespace Azure.ResourceManager.DeviceRegistry
 {
     /// <summary>
-    /// A Class representing a DeviceRegistryNamespaceDevice along with the instance operations that can be performed on it.
-    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="DeviceRegistryNamespaceDeviceResource"/>
-    /// from an instance of <see cref="ArmClient"/> using the GetDeviceRegistryNamespaceDeviceResource method.
-    /// Otherwise you can get one from its parent resource <see cref="DeviceRegistryNamespaceResource"/> using the GetDeviceRegistryNamespaceDevice method.
+    /// A Class representing a NamespaceDevice along with the instance operations that can be performed on it.
+    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="NamespaceDeviceResource"/>
+    /// from an instance of <see cref="ArmClient"/> using the GetNamespaceDeviceResource method.
+    /// Otherwise you can get one from its parent resource <see cref="NamespaceResource"/> using the GetNamespaceDevice method.
     /// </summary>
-    public partial class DeviceRegistryNamespaceDeviceResource : ArmResource
+    public partial class NamespaceDeviceResource : ArmResource
     {
-        /// <summary> Generate the resource identifier of a <see cref="DeviceRegistryNamespaceDeviceResource"/> instance. </summary>
+        /// <summary> Generate the resource identifier of a <see cref="NamespaceDeviceResource"/> instance. </summary>
         /// <param name="subscriptionId"> The subscriptionId. </param>
         /// <param name="resourceGroupName"> The resourceGroupName. </param>
         /// <param name="namespaceName"> The namespaceName. </param>
@@ -35,35 +35,35 @@ public static ResourceIdentifier CreateResourceIdentifier(string subscriptionId,
             return new ResourceIdentifier(resourceId);
         }
 
-        private readonly ClientDiagnostics _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics;
-        private readonly NamespaceDevicesRestOperations _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient;
-        private readonly DeviceRegistryNamespaceDeviceData _data;
+        private readonly ClientDiagnostics _namespaceDeviceClientDiagnostics;
+        private readonly NamespaceDevicesRestOperations _namespaceDeviceRestClient;
+        private readonly NamespaceDeviceData _data;
 
         /// <summary> Gets the resource type for the operations. </summary>
         public static readonly ResourceType ResourceType = "Microsoft.DeviceRegistry/namespaces/devices";
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceDeviceResource"/> class for mocking. </summary>
-        protected DeviceRegistryNamespaceDeviceResource()
+        /// <summary> Initializes a new instance of the <see cref="NamespaceDeviceResource"/> class for mocking. </summary>
+        protected NamespaceDeviceResource()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceDeviceResource"/> class. </summary>
+        /// <summary> Initializes a new instance of the <see cref="NamespaceDeviceResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="data"> The resource that is the target of operations. </param>
-        internal DeviceRegistryNamespaceDeviceResource(ArmClient client, DeviceRegistryNamespaceDeviceData data) : this(client, data.Id)
+        internal NamespaceDeviceResource(ArmClient client, NamespaceDeviceData data) : this(client, data.Id)
         {
             HasData = true;
             _data = data;
         }
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceDeviceResource"/> class. </summary>
+        /// <summary> Initializes a new instance of the <see cref="NamespaceDeviceResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the resource that is the target of operations. </param>
-        internal DeviceRegistryNamespaceDeviceResource(ArmClient client, ResourceIdentifier id) : base(client, id)
+        internal NamespaceDeviceResource(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(ResourceType, out string deviceRegistryNamespaceDeviceNamespaceDevicesApiVersion);
-            _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient = new NamespaceDevicesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, deviceRegistryNamespaceDeviceNamespaceDevicesApiVersion);
+            _namespaceDeviceClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", ResourceType.Namespace, Diagnostics);
+            TryGetApiVersion(ResourceType, out string namespaceDeviceApiVersion);
+            _namespaceDeviceRestClient = new NamespaceDevicesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, namespaceDeviceApiVersion);
 #if DEBUG
 			ValidateResourceId(Id);
 #endif
@@ -74,7 +74,7 @@ internal DeviceRegistryNamespaceDeviceResource(ArmClient client, ResourceIdentif
 
         /// <summary> Gets the data representing this Feature. </summary>
         /// <exception cref="InvalidOperationException"> Throws if there is no data loaded in the current instance. </exception>
-        public virtual DeviceRegistryNamespaceDeviceData Data
+        public virtual NamespaceDeviceData Data
         {
             get
             {
@@ -107,21 +107,21 @@ internal static void ValidateResourceId(ResourceIdentifier id)
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> GetAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDeviceResource>> GetAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceResource.Get");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceResource.Get");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceDeviceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDeviceResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceDeviceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -147,21 +147,21 @@ public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> GetAs
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual Response<DeviceRegistryNamespaceDeviceResource> Get(CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDeviceResource> Get(CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceResource.Get");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceResource.Get");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                var response = _namespaceDeviceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDeviceResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceDeviceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -187,7 +187,7 @@ public virtual Response<DeviceRegistryNamespaceDeviceResource> Get(CancellationT
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -195,12 +195,12 @@ public virtual Response<DeviceRegistryNamespaceDeviceResource> Get(CancellationT
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<ArmOperation> DeleteAsync(WaitUntil waitUntil, CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceResource.Delete");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceResource.Delete");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.DeleteAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation(_deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics, Pipeline, _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
+                var response = await _namespaceDeviceRestClient.DeleteAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation(_namespaceDeviceClientDiagnostics, Pipeline, _namespaceDeviceRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionResponseAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -229,7 +229,7 @@ public virtual async Task<ArmOperation> DeleteAsync(WaitUntil waitUntil, Cancell
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -237,12 +237,12 @@ public virtual async Task<ArmOperation> DeleteAsync(WaitUntil waitUntil, Cancell
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceResource.Delete");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceResource.Delete");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.Delete(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                var operation = new DeviceRegistryArmOperation(_deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics, Pipeline, _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
+                var response = _namespaceDeviceRestClient.Delete(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                var operation = new DeviceRegistryArmOperation(_namespaceDeviceClientDiagnostics, Pipeline, _namespaceDeviceRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletionResponse(cancellationToken);
                 return operation;
@@ -271,7 +271,7 @@ public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancel
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -279,16 +279,16 @@ public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancel
         /// <param name="patch"> The resource properties to be updated. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="patch"/> is null. </exception>
-        public virtual async Task<ArmOperation<DeviceRegistryNamespaceDeviceResource>> UpdateAsync(WaitUntil waitUntil, DeviceRegistryNamespaceDevicePatch patch, CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<NamespaceDeviceResource>> UpdateAsync(WaitUntil waitUntil, NamespaceDevicePatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(patch, nameof(patch));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceResource.Update");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceResource.Update");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceDeviceResource>(new DeviceRegistryNamespaceDeviceOperationSource(Client), _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics, Pipeline, _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
+                var response = await _namespaceDeviceRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation<NamespaceDeviceResource>(new NamespaceDeviceOperationSource(Client), _namespaceDeviceClientDiagnostics, Pipeline, _namespaceDeviceRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -317,7 +317,7 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceDeviceResource>> U
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -325,16 +325,16 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceDeviceResource>> U
         /// <param name="patch"> The resource properties to be updated. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="patch"/> is null. </exception>
-        public virtual ArmOperation<DeviceRegistryNamespaceDeviceResource> Update(WaitUntil waitUntil, DeviceRegistryNamespaceDevicePatch patch, CancellationToken cancellationToken = default)
+        public virtual ArmOperation<NamespaceDeviceResource> Update(WaitUntil waitUntil, NamespaceDevicePatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(patch, nameof(patch));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceResource.Update");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceResource.Update");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceDeviceResource>(new DeviceRegistryNamespaceDeviceOperationSource(Client), _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics, Pipeline, _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
+                var response = _namespaceDeviceRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken);
+                var operation = new DeviceRegistryArmOperation<NamespaceDeviceResource>(new NamespaceDeviceOperationSource(Client), _namespaceDeviceClientDiagnostics, Pipeline, _namespaceDeviceRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletion(cancellationToken);
                 return operation;
@@ -363,7 +363,7 @@ public virtual ArmOperation<DeviceRegistryNamespaceDeviceResource> Update(WaitUn
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -371,12 +371,12 @@ public virtual ArmOperation<DeviceRegistryNamespaceDeviceResource> Update(WaitUn
         /// <param name="value"> The value for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> or <paramref name="value"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> AddTagAsync(string key, string value, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDeviceResource>> AddTagAsync(string key, string value, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
             Argument.AssertNotNull(value, nameof(value));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceResource.AddTag");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceResource.AddTag");
             scope.Start();
             try
             {
@@ -385,13 +385,13 @@ public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> AddTa
                     var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false);
                     originalTags.Value.Data.TagValues[key] = value;
                     await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    var originalResponse = await _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                    return Response.FromValue(new DeviceRegistryNamespaceDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = await _namespaceDeviceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                    return Response.FromValue(new NamespaceDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = (await GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false)).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDevicePatch();
+                    var patch = new NamespaceDevicePatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
@@ -425,7 +425,7 @@ public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> AddTa
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -433,12 +433,12 @@ public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> AddTa
         /// <param name="value"> The value for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> or <paramref name="value"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceDeviceResource> AddTag(string key, string value, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDeviceResource> AddTag(string key, string value, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
             Argument.AssertNotNull(value, nameof(value));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceResource.AddTag");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceResource.AddTag");
             scope.Start();
             try
             {
@@ -447,13 +447,13 @@ public virtual Response<DeviceRegistryNamespaceDeviceResource> AddTag(string key
                     var originalTags = GetTagResource().Get(cancellationToken);
                     originalTags.Value.Data.TagValues[key] = value;
                     GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken);
-                    var originalResponse = _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                    return Response.FromValue(new DeviceRegistryNamespaceDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = _namespaceDeviceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                    return Response.FromValue(new NamespaceDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = Get(cancellationToken: cancellationToken).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDevicePatch();
+                    var patch = new NamespaceDevicePatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
@@ -487,18 +487,18 @@ public virtual Response<DeviceRegistryNamespaceDeviceResource> AddTag(string key
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="tags"> The set of tags to use as replacement. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="tags"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> SetTagsAsync(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDeviceResource>> SetTagsAsync(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(tags, nameof(tags));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceResource.SetTags");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceResource.SetTags");
             scope.Start();
             try
             {
@@ -508,13 +508,13 @@ public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> SetTa
                     var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false);
                     originalTags.Value.Data.TagValues.ReplaceWith(tags);
                     await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    var originalResponse = await _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                    return Response.FromValue(new DeviceRegistryNamespaceDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = await _namespaceDeviceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                    return Response.FromValue(new NamespaceDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = (await GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false)).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDevicePatch();
+                    var patch = new NamespaceDevicePatch();
                     patch.Tags.ReplaceWith(tags);
                     var result = await UpdateAsync(WaitUntil.Completed, patch, cancellationToken: cancellationToken).ConfigureAwait(false);
                     return Response.FromValue(result.Value, result.GetRawResponse());
@@ -544,18 +544,18 @@ public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> SetTa
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="tags"> The set of tags to use as replacement. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="tags"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceDeviceResource> SetTags(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDeviceResource> SetTags(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(tags, nameof(tags));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceResource.SetTags");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceResource.SetTags");
             scope.Start();
             try
             {
@@ -565,13 +565,13 @@ public virtual Response<DeviceRegistryNamespaceDeviceResource> SetTags(IDictiona
                     var originalTags = GetTagResource().Get(cancellationToken);
                     originalTags.Value.Data.TagValues.ReplaceWith(tags);
                     GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken);
-                    var originalResponse = _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                    return Response.FromValue(new DeviceRegistryNamespaceDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = _namespaceDeviceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                    return Response.FromValue(new NamespaceDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = Get(cancellationToken: cancellationToken).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDevicePatch();
+                    var patch = new NamespaceDevicePatch();
                     patch.Tags.ReplaceWith(tags);
                     var result = Update(WaitUntil.Completed, patch, cancellationToken: cancellationToken);
                     return Response.FromValue(result.Value, result.GetRawResponse());
@@ -601,18 +601,18 @@ public virtual Response<DeviceRegistryNamespaceDeviceResource> SetTags(IDictiona
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="key"> The key for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> RemoveTagAsync(string key, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDeviceResource>> RemoveTagAsync(string key, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceResource.RemoveTag");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceResource.RemoveTag");
             scope.Start();
             try
             {
@@ -621,13 +621,13 @@ public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> Remov
                     var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false);
                     originalTags.Value.Data.TagValues.Remove(key);
                     await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    var originalResponse = await _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                    return Response.FromValue(new DeviceRegistryNamespaceDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = await _namespaceDeviceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                    return Response.FromValue(new NamespaceDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = (await GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false)).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDevicePatch();
+                    var patch = new NamespaceDevicePatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
@@ -661,18 +661,18 @@ public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> Remov
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="key"> The key for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceDeviceResource> RemoveTag(string key, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDeviceResource> RemoveTag(string key, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
 
-            using var scope = _deviceRegistryNamespaceDeviceNamespaceDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDeviceResource.RemoveTag");
+            using var scope = _namespaceDeviceClientDiagnostics.CreateScope("NamespaceDeviceResource.RemoveTag");
             scope.Start();
             try
             {
@@ -681,13 +681,13 @@ public virtual Response<DeviceRegistryNamespaceDeviceResource> RemoveTag(string
                     var originalTags = GetTagResource().Get(cancellationToken);
                     originalTags.Value.Data.TagValues.Remove(key);
                     GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken);
-                    var originalResponse = _deviceRegistryNamespaceDeviceNamespaceDevicesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                    return Response.FromValue(new DeviceRegistryNamespaceDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = _namespaceDeviceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                    return Response.FromValue(new NamespaceDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = Get(cancellationToken: cancellationToken).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDevicePatch();
+                    var patch = new NamespaceDevicePatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredAssetCollection.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredAssetCollection.cs
similarity index 60%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredAssetCollection.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredAssetCollection.cs
index 94cd9a383f2a..56bc330157cd 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredAssetCollection.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredAssetCollection.cs
@@ -18,28 +18,28 @@
 namespace Azure.ResourceManager.DeviceRegistry
 {
     /// <summary>
-    /// A class representing a collection of <see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/> and their operations.
-    /// Each <see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/> in the collection will belong to the same instance of <see cref="DeviceRegistryNamespaceResource"/>.
-    /// To get a <see cref="DeviceRegistryNamespaceDiscoveredAssetCollection"/> instance call the GetDeviceRegistryNamespaceDiscoveredAssets method from an instance of <see cref="DeviceRegistryNamespaceResource"/>.
+    /// A class representing a collection of <see cref="NamespaceDiscoveredAssetResource"/> and their operations.
+    /// Each <see cref="NamespaceDiscoveredAssetResource"/> in the collection will belong to the same instance of <see cref="NamespaceResource"/>.
+    /// To get a <see cref="NamespaceDiscoveredAssetCollection"/> instance call the GetNamespaceDiscoveredAssets method from an instance of <see cref="NamespaceResource"/>.
     /// </summary>
-    public partial class DeviceRegistryNamespaceDiscoveredAssetCollection : ArmCollection, IEnumerable<DeviceRegistryNamespaceDiscoveredAssetResource>, IAsyncEnumerable<DeviceRegistryNamespaceDiscoveredAssetResource>
+    public partial class NamespaceDiscoveredAssetCollection : ArmCollection, IEnumerable<NamespaceDiscoveredAssetResource>, IAsyncEnumerable<NamespaceDiscoveredAssetResource>
     {
-        private readonly ClientDiagnostics _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics;
-        private readonly NamespaceDiscoveredAssetsRestOperations _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient;
+        private readonly ClientDiagnostics _namespaceDiscoveredAssetClientDiagnostics;
+        private readonly NamespaceDiscoveredAssetsRestOperations _namespaceDiscoveredAssetRestClient;
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceDiscoveredAssetCollection"/> class for mocking. </summary>
-        protected DeviceRegistryNamespaceDiscoveredAssetCollection()
+        /// <summary> Initializes a new instance of the <see cref="NamespaceDiscoveredAssetCollection"/> class for mocking. </summary>
+        protected NamespaceDiscoveredAssetCollection()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceDiscoveredAssetCollection"/> class. </summary>
+        /// <summary> Initializes a new instance of the <see cref="NamespaceDiscoveredAssetCollection"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the parent resource that is the target of operations. </param>
-        internal DeviceRegistryNamespaceDiscoveredAssetCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
+        internal NamespaceDiscoveredAssetCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", DeviceRegistryNamespaceDiscoveredAssetResource.ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(DeviceRegistryNamespaceDiscoveredAssetResource.ResourceType, out string deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsApiVersion);
-            _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient = new NamespaceDiscoveredAssetsRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsApiVersion);
+            _namespaceDiscoveredAssetClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", NamespaceDiscoveredAssetResource.ResourceType.Namespace, Diagnostics);
+            TryGetApiVersion(NamespaceDiscoveredAssetResource.ResourceType, out string namespaceDiscoveredAssetApiVersion);
+            _namespaceDiscoveredAssetRestClient = new NamespaceDiscoveredAssetsRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, namespaceDiscoveredAssetApiVersion);
 #if DEBUG
 			ValidateResourceId(Id);
 #endif
@@ -47,8 +47,8 @@ internal DeviceRegistryNamespaceDiscoveredAssetCollection(ArmClient client, Reso
 
         internal static void ValidateResourceId(ResourceIdentifier id)
         {
-            if (id.ResourceType != DeviceRegistryNamespaceResource.ResourceType)
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, "Invalid resource type {0} expected {1}", id.ResourceType, DeviceRegistryNamespaceResource.ResourceType), nameof(id));
+            if (id.ResourceType != NamespaceResource.ResourceType)
+                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, "Invalid resource type {0} expected {1}", id.ResourceType, NamespaceResource.ResourceType), nameof(id));
         }
 
         /// <summary>
@@ -68,7 +68,7 @@ internal static void ValidateResourceId(ResourceIdentifier id)
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -78,17 +78,17 @@ internal static void ValidateResourceId(ResourceIdentifier id)
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="discoveredAssetName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredAssetName"/> or <paramref name="data"/> is null. </exception>
-        public virtual async Task<ArmOperation<DeviceRegistryNamespaceDiscoveredAssetResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string discoveredAssetName, DeviceRegistryNamespaceDiscoveredAssetData data, CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<NamespaceDiscoveredAssetResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string discoveredAssetName, NamespaceDiscoveredAssetData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(discoveredAssetName, nameof(discoveredAssetName));
             Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetCollection.CreateOrUpdate");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.CreateOrReplaceAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, data, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceDiscoveredAssetResource>(new DeviceRegistryNamespaceDiscoveredAssetOperationSource(Client), _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics, Pipeline, _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                var response = await _namespaceDiscoveredAssetRestClient.CreateOrReplaceAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, data, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation<NamespaceDiscoveredAssetResource>(new NamespaceDiscoveredAssetOperationSource(Client), _namespaceDiscoveredAssetClientDiagnostics, Pipeline, _namespaceDiscoveredAssetRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -117,7 +117,7 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceDiscoveredAssetRes
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -127,17 +127,17 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceDiscoveredAssetRes
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="discoveredAssetName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredAssetName"/> or <paramref name="data"/> is null. </exception>
-        public virtual ArmOperation<DeviceRegistryNamespaceDiscoveredAssetResource> CreateOrUpdate(WaitUntil waitUntil, string discoveredAssetName, DeviceRegistryNamespaceDiscoveredAssetData data, CancellationToken cancellationToken = default)
+        public virtual ArmOperation<NamespaceDiscoveredAssetResource> CreateOrUpdate(WaitUntil waitUntil, string discoveredAssetName, NamespaceDiscoveredAssetData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(discoveredAssetName, nameof(discoveredAssetName));
             Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetCollection.CreateOrUpdate");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.CreateOrReplace(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, data, cancellationToken);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceDiscoveredAssetResource>(new DeviceRegistryNamespaceDiscoveredAssetOperationSource(Client), _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics, Pipeline, _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                var response = _namespaceDiscoveredAssetRestClient.CreateOrReplace(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, data, cancellationToken);
+                var operation = new DeviceRegistryArmOperation<NamespaceDiscoveredAssetResource>(new NamespaceDiscoveredAssetOperationSource(Client), _namespaceDiscoveredAssetClientDiagnostics, Pipeline, _namespaceDiscoveredAssetRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletion(cancellationToken);
                 return operation;
@@ -166,7 +166,7 @@ public virtual ArmOperation<DeviceRegistryNamespaceDiscoveredAssetResource> Crea
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -174,18 +174,18 @@ public virtual ArmOperation<DeviceRegistryNamespaceDiscoveredAssetResource> Crea
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="discoveredAssetName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredAssetName"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResource>> GetAsync(string discoveredAssetName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDiscoveredAssetResource>> GetAsync(string discoveredAssetName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(discoveredAssetName, nameof(discoveredAssetName));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetCollection.Get");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetCollection.Get");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceDiscoveredAssetRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, cancellationToken).ConfigureAwait(false);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDiscoveredAssetResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceDiscoveredAssetResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -211,7 +211,7 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResourc
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -219,18 +219,18 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="discoveredAssetName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredAssetName"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceDiscoveredAssetResource> Get(string discoveredAssetName, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDiscoveredAssetResource> Get(string discoveredAssetName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(discoveredAssetName, nameof(discoveredAssetName));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetCollection.Get");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetCollection.Get");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, cancellationToken);
+                var response = _namespaceDiscoveredAssetRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, cancellationToken);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDiscoveredAssetResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceDiscoveredAssetResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -256,17 +256,17 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredAssetResource> Get(stri
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> An async collection of <see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/> that may take multiple service requests to iterate over. </returns>
-        public virtual AsyncPageable<DeviceRegistryNamespaceDiscoveredAssetResource> GetAllAsync(CancellationToken cancellationToken = default)
+        /// <returns> An async collection of <see cref="NamespaceDiscoveredAssetResource"/> that may take multiple service requests to iterate over. </returns>
+        public virtual AsyncPageable<NamespaceDiscoveredAssetResource> GetAllAsync(CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new DeviceRegistryNamespaceDiscoveredAssetResource(Client, DeviceRegistryNamespaceDiscoveredAssetData.DeserializeDeviceRegistryNamespaceDiscoveredAssetData(e)), _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics, Pipeline, "DeviceRegistryNamespaceDiscoveredAssetCollection.GetAll", "value", "nextLink", cancellationToken);
+            HttpMessage FirstPageRequest(int? pageSizeHint) => _namespaceDiscoveredAssetRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _namespaceDiscoveredAssetRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new NamespaceDiscoveredAssetResource(Client, NamespaceDiscoveredAssetData.DeserializeNamespaceDiscoveredAssetData(e)), _namespaceDiscoveredAssetClientDiagnostics, Pipeline, "NamespaceDiscoveredAssetCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -286,17 +286,17 @@ public virtual AsyncPageable<DeviceRegistryNamespaceDiscoveredAssetResource> Get
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> A collection of <see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/> that may take multiple service requests to iterate over. </returns>
-        public virtual Pageable<DeviceRegistryNamespaceDiscoveredAssetResource> GetAll(CancellationToken cancellationToken = default)
+        /// <returns> A collection of <see cref="NamespaceDiscoveredAssetResource"/> that may take multiple service requests to iterate over. </returns>
+        public virtual Pageable<NamespaceDiscoveredAssetResource> GetAll(CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new DeviceRegistryNamespaceDiscoveredAssetResource(Client, DeviceRegistryNamespaceDiscoveredAssetData.DeserializeDeviceRegistryNamespaceDiscoveredAssetData(e)), _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics, Pipeline, "DeviceRegistryNamespaceDiscoveredAssetCollection.GetAll", "value", "nextLink", cancellationToken);
+            HttpMessage FirstPageRequest(int? pageSizeHint) => _namespaceDiscoveredAssetRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _namespaceDiscoveredAssetRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new NamespaceDiscoveredAssetResource(Client, NamespaceDiscoveredAssetData.DeserializeNamespaceDiscoveredAssetData(e)), _namespaceDiscoveredAssetClientDiagnostics, Pipeline, "NamespaceDiscoveredAssetCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -316,7 +316,7 @@ public virtual Pageable<DeviceRegistryNamespaceDiscoveredAssetResource> GetAll(C
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -328,11 +328,11 @@ public virtual async Task<Response<bool>> ExistsAsync(string discoveredAssetName
         {
             Argument.AssertNotNullOrEmpty(discoveredAssetName, nameof(discoveredAssetName));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetCollection.Exists");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetCollection.Exists");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceDiscoveredAssetRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, cancellationToken: cancellationToken).ConfigureAwait(false);
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -359,7 +359,7 @@ public virtual async Task<Response<bool>> ExistsAsync(string discoveredAssetName
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -371,11 +371,11 @@ public virtual Response<bool> Exists(string discoveredAssetName, CancellationTok
         {
             Argument.AssertNotNullOrEmpty(discoveredAssetName, nameof(discoveredAssetName));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetCollection.Exists");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetCollection.Exists");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, cancellationToken: cancellationToken);
+                var response = _namespaceDiscoveredAssetRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, cancellationToken: cancellationToken);
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -402,7 +402,7 @@ public virtual Response<bool> Exists(string discoveredAssetName, CancellationTok
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -410,18 +410,18 @@ public virtual Response<bool> Exists(string discoveredAssetName, CancellationTok
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="discoveredAssetName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredAssetName"/> is null. </exception>
-        public virtual async Task<NullableResponse<DeviceRegistryNamespaceDiscoveredAssetResource>> GetIfExistsAsync(string discoveredAssetName, CancellationToken cancellationToken = default)
+        public virtual async Task<NullableResponse<NamespaceDiscoveredAssetResource>> GetIfExistsAsync(string discoveredAssetName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(discoveredAssetName, nameof(discoveredAssetName));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetCollection.GetIfExists");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceDiscoveredAssetRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, cancellationToken: cancellationToken).ConfigureAwait(false);
                 if (response.Value == null)
-                    return new NoValueResponse<DeviceRegistryNamespaceDiscoveredAssetResource>(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDiscoveredAssetResource(Client, response.Value), response.GetRawResponse());
+                    return new NoValueResponse<NamespaceDiscoveredAssetResource>(response.GetRawResponse());
+                return Response.FromValue(new NamespaceDiscoveredAssetResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -447,7 +447,7 @@ public virtual async Task<NullableResponse<DeviceRegistryNamespaceDiscoveredAsse
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -455,18 +455,18 @@ public virtual async Task<NullableResponse<DeviceRegistryNamespaceDiscoveredAsse
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="discoveredAssetName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredAssetName"/> is null. </exception>
-        public virtual NullableResponse<DeviceRegistryNamespaceDiscoveredAssetResource> GetIfExists(string discoveredAssetName, CancellationToken cancellationToken = default)
+        public virtual NullableResponse<NamespaceDiscoveredAssetResource> GetIfExists(string discoveredAssetName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(discoveredAssetName, nameof(discoveredAssetName));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetCollection.GetIfExists");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, cancellationToken: cancellationToken);
+                var response = _namespaceDiscoveredAssetRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredAssetName, cancellationToken: cancellationToken);
                 if (response.Value == null)
-                    return new NoValueResponse<DeviceRegistryNamespaceDiscoveredAssetResource>(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDiscoveredAssetResource(Client, response.Value), response.GetRawResponse());
+                    return new NoValueResponse<NamespaceDiscoveredAssetResource>(response.GetRawResponse());
+                return Response.FromValue(new NamespaceDiscoveredAssetResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -475,7 +475,7 @@ public virtual NullableResponse<DeviceRegistryNamespaceDiscoveredAssetResource>
             }
         }
 
-        IEnumerator<DeviceRegistryNamespaceDiscoveredAssetResource> IEnumerable<DeviceRegistryNamespaceDiscoveredAssetResource>.GetEnumerator()
+        IEnumerator<NamespaceDiscoveredAssetResource> IEnumerable<NamespaceDiscoveredAssetResource>.GetEnumerator()
         {
             return GetAll().GetEnumerator();
         }
@@ -485,7 +485,7 @@ IEnumerator IEnumerable.GetEnumerator()
             return GetAll().GetEnumerator();
         }
 
-        IAsyncEnumerator<DeviceRegistryNamespaceDiscoveredAssetResource> IAsyncEnumerable<DeviceRegistryNamespaceDiscoveredAssetResource>.GetAsyncEnumerator(CancellationToken cancellationToken)
+        IAsyncEnumerator<NamespaceDiscoveredAssetResource> IAsyncEnumerable<NamespaceDiscoveredAssetResource>.GetAsyncEnumerator(CancellationToken cancellationToken)
         {
             return GetAllAsync(cancellationToken: cancellationToken).GetAsyncEnumerator(cancellationToken);
         }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredAssetData.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredAssetData.Serialization.cs
similarity index 70%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredAssetData.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredAssetData.Serialization.cs
index 74125c3f445b..5a5623531e62 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredAssetData.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredAssetData.Serialization.cs
@@ -16,11 +16,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry
 {
-    public partial class DeviceRegistryNamespaceDiscoveredAssetData : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceDiscoveredAssetData>
+    public partial class NamespaceDiscoveredAssetData : IUtf8JsonSerializable, IJsonModel<NamespaceDiscoveredAssetData>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceDiscoveredAssetData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceDiscoveredAssetData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceDiscoveredAssetData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceDiscoveredAssetData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -31,10 +31,10 @@ void IJsonModel<DeviceRegistryNamespaceDiscoveredAssetData>.Write(Utf8JsonWriter
         /// <param name="options"> The client options for reading and writing models. </param>
         protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredAssetData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredAssetData)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDiscoveredAssetData)} does not support writing '{format}' format.");
             }
 
             base.JsonModelWriteCore(writer, options);
@@ -47,19 +47,19 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri
             writer.WriteObjectValue(ExtendedLocation, options);
         }
 
-        DeviceRegistryNamespaceDiscoveredAssetData IJsonModel<DeviceRegistryNamespaceDiscoveredAssetData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceDiscoveredAssetData IJsonModel<NamespaceDiscoveredAssetData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredAssetData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredAssetData)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDiscoveredAssetData)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceDiscoveredAssetData(document.RootElement, options);
+            return DeserializeNamespaceDiscoveredAssetData(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceDiscoveredAssetData DeserializeDeviceRegistryNamespaceDiscoveredAssetData(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceDiscoveredAssetData DeserializeNamespaceDiscoveredAssetData(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -67,7 +67,7 @@ internal static DeviceRegistryNamespaceDiscoveredAssetData DeserializeDeviceRegi
             {
                 return null;
             }
-            DeviceRegistryNamespaceDiscoveredAssetProperties properties = default;
+            NamespaceDiscoveredAssetProperties properties = default;
             DeviceRegistryExtendedLocation extendedLocation = default;
             IDictionary<string, string> tags = default;
             AzureLocation location = default;
@@ -85,7 +85,7 @@ internal static DeviceRegistryNamespaceDiscoveredAssetData DeserializeDeviceRegi
                     {
                         continue;
                     }
-                    properties = DeviceRegistryNamespaceDiscoveredAssetProperties.DeserializeDeviceRegistryNamespaceDiscoveredAssetProperties(property.Value, options);
+                    properties = NamespaceDiscoveredAssetProperties.DeserializeNamespaceDiscoveredAssetProperties(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("extendedLocation"u8))
@@ -142,7 +142,7 @@ internal static DeviceRegistryNamespaceDiscoveredAssetData DeserializeDeviceRegi
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceDiscoveredAssetData(
+            return new NamespaceDiscoveredAssetData(
                 id,
                 name,
                 type,
@@ -154,35 +154,35 @@ internal static DeviceRegistryNamespaceDiscoveredAssetData DeserializeDeviceRegi
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetData>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceDiscoveredAssetData>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredAssetData>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredAssetData)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDiscoveredAssetData)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceDiscoveredAssetData IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetData>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceDiscoveredAssetData IPersistableModel<NamespaceDiscoveredAssetData>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredAssetData>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceDiscoveredAssetData(document.RootElement, options);
+                        return DeserializeNamespaceDiscoveredAssetData(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredAssetData)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDiscoveredAssetData)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceDiscoveredAssetData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceDiscoveredAssetData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredAssetData.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredAssetData.cs
similarity index 71%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredAssetData.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredAssetData.cs
index 231130ed5876..d07b4c8bd2aa 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredAssetData.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredAssetData.cs
@@ -14,10 +14,10 @@
 namespace Azure.ResourceManager.DeviceRegistry
 {
     /// <summary>
-    /// A class representing the DeviceRegistryNamespaceDiscoveredAsset data model.
+    /// A class representing the NamespaceDiscoveredAsset data model.
     /// Discovered asset definition.
     /// </summary>
-    public partial class DeviceRegistryNamespaceDiscoveredAssetData : TrackedResourceData
+    public partial class NamespaceDiscoveredAssetData : TrackedResourceData
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -51,18 +51,18 @@ public partial class DeviceRegistryNamespaceDiscoveredAssetData : TrackedResourc
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredAssetData"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredAssetData"/>. </summary>
         /// <param name="location"> The location. </param>
         /// <param name="extendedLocation"> The extended location. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="extendedLocation"/> is null. </exception>
-        public DeviceRegistryNamespaceDiscoveredAssetData(AzureLocation location, DeviceRegistryExtendedLocation extendedLocation) : base(location)
+        public NamespaceDiscoveredAssetData(AzureLocation location, DeviceRegistryExtendedLocation extendedLocation) : base(location)
         {
             Argument.AssertNotNull(extendedLocation, nameof(extendedLocation));
 
             ExtendedLocation = extendedLocation;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredAssetData"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredAssetData"/>. </summary>
         /// <param name="id"> The id. </param>
         /// <param name="name"> The name. </param>
         /// <param name="resourceType"> The resourceType. </param>
@@ -72,20 +72,20 @@ public DeviceRegistryNamespaceDiscoveredAssetData(AzureLocation location, Device
         /// <param name="properties"> The resource-specific properties for this resource. </param>
         /// <param name="extendedLocation"> The extended location. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceDiscoveredAssetData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, string> tags, AzureLocation location, DeviceRegistryNamespaceDiscoveredAssetProperties properties, DeviceRegistryExtendedLocation extendedLocation, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData, tags, location)
+        internal NamespaceDiscoveredAssetData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, string> tags, AzureLocation location, NamespaceDiscoveredAssetProperties properties, DeviceRegistryExtendedLocation extendedLocation, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData, tags, location)
         {
             Properties = properties;
             ExtendedLocation = extendedLocation;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredAssetData"/> for deserialization. </summary>
-        internal DeviceRegistryNamespaceDiscoveredAssetData()
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredAssetData"/> for deserialization. </summary>
+        internal NamespaceDiscoveredAssetData()
         {
         }
 
         /// <summary> The resource-specific properties for this resource. </summary>
-        public DeviceRegistryNamespaceDiscoveredAssetProperties Properties { get; set; }
+        public NamespaceDiscoveredAssetProperties Properties { get; set; }
         /// <summary> The extended location. </summary>
         public DeviceRegistryExtendedLocation ExtendedLocation { get; set; }
     }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredAssetResource.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredAssetResource.Serialization.cs
new file mode 100644
index 000000000000..ff4c5ecbe74e
--- /dev/null
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredAssetResource.Serialization.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+
+namespace Azure.ResourceManager.DeviceRegistry
+{
+    public partial class NamespaceDiscoveredAssetResource : IJsonModel<NamespaceDiscoveredAssetData>
+    {
+        private static NamespaceDiscoveredAssetData s_dataDeserializationInstance;
+        private static NamespaceDiscoveredAssetData DataDeserializationInstance => s_dataDeserializationInstance ??= new();
+
+        void IJsonModel<NamespaceDiscoveredAssetData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<NamespaceDiscoveredAssetData>)Data).Write(writer, options);
+
+        NamespaceDiscoveredAssetData IJsonModel<NamespaceDiscoveredAssetData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => ((IJsonModel<NamespaceDiscoveredAssetData>)DataDeserializationInstance).Create(ref reader, options);
+
+        BinaryData IPersistableModel<NamespaceDiscoveredAssetData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<NamespaceDiscoveredAssetData>(Data, options, AzureResourceManagerDeviceRegistryContext.Default);
+
+        NamespaceDiscoveredAssetData IPersistableModel<NamespaceDiscoveredAssetData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<NamespaceDiscoveredAssetData>(data, options, AzureResourceManagerDeviceRegistryContext.Default);
+
+        string IPersistableModel<NamespaceDiscoveredAssetData>.GetFormatFromOptions(ModelReaderWriterOptions options) => ((IPersistableModel<NamespaceDiscoveredAssetData>)DataDeserializationInstance).GetFormatFromOptions(options);
+    }
+}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredAssetResource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredAssetResource.cs
similarity index 67%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredAssetResource.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredAssetResource.cs
index ac0cd04131ef..18ab7ccffbdb 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredAssetResource.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredAssetResource.cs
@@ -17,14 +17,14 @@
 namespace Azure.ResourceManager.DeviceRegistry
 {
     /// <summary>
-    /// A Class representing a DeviceRegistryNamespaceDiscoveredAsset along with the instance operations that can be performed on it.
-    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/>
-    /// from an instance of <see cref="ArmClient"/> using the GetDeviceRegistryNamespaceDiscoveredAssetResource method.
-    /// Otherwise you can get one from its parent resource <see cref="DeviceRegistryNamespaceResource"/> using the GetDeviceRegistryNamespaceDiscoveredAsset method.
+    /// A Class representing a NamespaceDiscoveredAsset along with the instance operations that can be performed on it.
+    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="NamespaceDiscoveredAssetResource"/>
+    /// from an instance of <see cref="ArmClient"/> using the GetNamespaceDiscoveredAssetResource method.
+    /// Otherwise you can get one from its parent resource <see cref="NamespaceResource"/> using the GetNamespaceDiscoveredAsset method.
     /// </summary>
-    public partial class DeviceRegistryNamespaceDiscoveredAssetResource : ArmResource
+    public partial class NamespaceDiscoveredAssetResource : ArmResource
     {
-        /// <summary> Generate the resource identifier of a <see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/> instance. </summary>
+        /// <summary> Generate the resource identifier of a <see cref="NamespaceDiscoveredAssetResource"/> instance. </summary>
         /// <param name="subscriptionId"> The subscriptionId. </param>
         /// <param name="resourceGroupName"> The resourceGroupName. </param>
         /// <param name="namespaceName"> The namespaceName. </param>
@@ -35,35 +35,35 @@ public static ResourceIdentifier CreateResourceIdentifier(string subscriptionId,
             return new ResourceIdentifier(resourceId);
         }
 
-        private readonly ClientDiagnostics _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics;
-        private readonly NamespaceDiscoveredAssetsRestOperations _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient;
-        private readonly DeviceRegistryNamespaceDiscoveredAssetData _data;
+        private readonly ClientDiagnostics _namespaceDiscoveredAssetClientDiagnostics;
+        private readonly NamespaceDiscoveredAssetsRestOperations _namespaceDiscoveredAssetRestClient;
+        private readonly NamespaceDiscoveredAssetData _data;
 
         /// <summary> Gets the resource type for the operations. </summary>
         public static readonly ResourceType ResourceType = "Microsoft.DeviceRegistry/namespaces/discoveredAssets";
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/> class for mocking. </summary>
-        protected DeviceRegistryNamespaceDiscoveredAssetResource()
+        /// <summary> Initializes a new instance of the <see cref="NamespaceDiscoveredAssetResource"/> class for mocking. </summary>
+        protected NamespaceDiscoveredAssetResource()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/> class. </summary>
+        /// <summary> Initializes a new instance of the <see cref="NamespaceDiscoveredAssetResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="data"> The resource that is the target of operations. </param>
-        internal DeviceRegistryNamespaceDiscoveredAssetResource(ArmClient client, DeviceRegistryNamespaceDiscoveredAssetData data) : this(client, data.Id)
+        internal NamespaceDiscoveredAssetResource(ArmClient client, NamespaceDiscoveredAssetData data) : this(client, data.Id)
         {
             HasData = true;
             _data = data;
         }
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/> class. </summary>
+        /// <summary> Initializes a new instance of the <see cref="NamespaceDiscoveredAssetResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the resource that is the target of operations. </param>
-        internal DeviceRegistryNamespaceDiscoveredAssetResource(ArmClient client, ResourceIdentifier id) : base(client, id)
+        internal NamespaceDiscoveredAssetResource(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(ResourceType, out string deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsApiVersion);
-            _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient = new NamespaceDiscoveredAssetsRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsApiVersion);
+            _namespaceDiscoveredAssetClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", ResourceType.Namespace, Diagnostics);
+            TryGetApiVersion(ResourceType, out string namespaceDiscoveredAssetApiVersion);
+            _namespaceDiscoveredAssetRestClient = new NamespaceDiscoveredAssetsRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, namespaceDiscoveredAssetApiVersion);
 #if DEBUG
 			ValidateResourceId(Id);
 #endif
@@ -74,7 +74,7 @@ internal DeviceRegistryNamespaceDiscoveredAssetResource(ArmClient client, Resour
 
         /// <summary> Gets the data representing this Feature. </summary>
         /// <exception cref="InvalidOperationException"> Throws if there is no data loaded in the current instance. </exception>
-        public virtual DeviceRegistryNamespaceDiscoveredAssetData Data
+        public virtual NamespaceDiscoveredAssetData Data
         {
             get
             {
@@ -107,21 +107,21 @@ internal static void ValidateResourceId(ResourceIdentifier id)
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResource>> GetAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDiscoveredAssetResource>> GetAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetResource.Get");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetResource.Get");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceDiscoveredAssetRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDiscoveredAssetResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceDiscoveredAssetResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -147,21 +147,21 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResourc
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual Response<DeviceRegistryNamespaceDiscoveredAssetResource> Get(CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDiscoveredAssetResource> Get(CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetResource.Get");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetResource.Get");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                var response = _namespaceDiscoveredAssetRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDiscoveredAssetResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceDiscoveredAssetResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -187,7 +187,7 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredAssetResource> Get(Canc
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -195,12 +195,12 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredAssetResource> Get(Canc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<ArmOperation> DeleteAsync(WaitUntil waitUntil, CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetResource.Delete");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetResource.Delete");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.DeleteAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation(_deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics, Pipeline, _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
+                var response = await _namespaceDiscoveredAssetRestClient.DeleteAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation(_namespaceDiscoveredAssetClientDiagnostics, Pipeline, _namespaceDiscoveredAssetRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionResponseAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -229,7 +229,7 @@ public virtual async Task<ArmOperation> DeleteAsync(WaitUntil waitUntil, Cancell
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -237,12 +237,12 @@ public virtual async Task<ArmOperation> DeleteAsync(WaitUntil waitUntil, Cancell
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetResource.Delete");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetResource.Delete");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.Delete(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                var operation = new DeviceRegistryArmOperation(_deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics, Pipeline, _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
+                var response = _namespaceDiscoveredAssetRestClient.Delete(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                var operation = new DeviceRegistryArmOperation(_namespaceDiscoveredAssetClientDiagnostics, Pipeline, _namespaceDiscoveredAssetRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletionResponse(cancellationToken);
                 return operation;
@@ -271,7 +271,7 @@ public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancel
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -279,16 +279,16 @@ public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancel
         /// <param name="patch"> The resource properties to be updated. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="patch"/> is null. </exception>
-        public virtual async Task<ArmOperation<DeviceRegistryNamespaceDiscoveredAssetResource>> UpdateAsync(WaitUntil waitUntil, DeviceRegistryNamespaceDiscoveredAssetPatch patch, CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<NamespaceDiscoveredAssetResource>> UpdateAsync(WaitUntil waitUntil, NamespaceDiscoveredAssetPatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(patch, nameof(patch));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetResource.Update");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetResource.Update");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceDiscoveredAssetResource>(new DeviceRegistryNamespaceDiscoveredAssetOperationSource(Client), _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics, Pipeline, _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
+                var response = await _namespaceDiscoveredAssetRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation<NamespaceDiscoveredAssetResource>(new NamespaceDiscoveredAssetOperationSource(Client), _namespaceDiscoveredAssetClientDiagnostics, Pipeline, _namespaceDiscoveredAssetRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -317,7 +317,7 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceDiscoveredAssetRes
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -325,16 +325,16 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceDiscoveredAssetRes
         /// <param name="patch"> The resource properties to be updated. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="patch"/> is null. </exception>
-        public virtual ArmOperation<DeviceRegistryNamespaceDiscoveredAssetResource> Update(WaitUntil waitUntil, DeviceRegistryNamespaceDiscoveredAssetPatch patch, CancellationToken cancellationToken = default)
+        public virtual ArmOperation<NamespaceDiscoveredAssetResource> Update(WaitUntil waitUntil, NamespaceDiscoveredAssetPatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(patch, nameof(patch));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetResource.Update");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetResource.Update");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceDiscoveredAssetResource>(new DeviceRegistryNamespaceDiscoveredAssetOperationSource(Client), _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics, Pipeline, _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
+                var response = _namespaceDiscoveredAssetRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken);
+                var operation = new DeviceRegistryArmOperation<NamespaceDiscoveredAssetResource>(new NamespaceDiscoveredAssetOperationSource(Client), _namespaceDiscoveredAssetClientDiagnostics, Pipeline, _namespaceDiscoveredAssetRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletion(cancellationToken);
                 return operation;
@@ -363,7 +363,7 @@ public virtual ArmOperation<DeviceRegistryNamespaceDiscoveredAssetResource> Upda
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -371,12 +371,12 @@ public virtual ArmOperation<DeviceRegistryNamespaceDiscoveredAssetResource> Upda
         /// <param name="value"> The value for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> or <paramref name="value"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResource>> AddTagAsync(string key, string value, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDiscoveredAssetResource>> AddTagAsync(string key, string value, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
             Argument.AssertNotNull(value, nameof(value));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetResource.AddTag");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetResource.AddTag");
             scope.Start();
             try
             {
@@ -385,13 +385,13 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResourc
                     var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false);
                     originalTags.Value.Data.TagValues[key] = value;
                     await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    var originalResponse = await _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                    return Response.FromValue(new DeviceRegistryNamespaceDiscoveredAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = await _namespaceDiscoveredAssetRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                    return Response.FromValue(new NamespaceDiscoveredAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = (await GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false)).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDiscoveredAssetPatch();
+                    var patch = new NamespaceDiscoveredAssetPatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
@@ -425,7 +425,7 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResourc
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -433,12 +433,12 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResourc
         /// <param name="value"> The value for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> or <paramref name="value"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceDiscoveredAssetResource> AddTag(string key, string value, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDiscoveredAssetResource> AddTag(string key, string value, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
             Argument.AssertNotNull(value, nameof(value));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetResource.AddTag");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetResource.AddTag");
             scope.Start();
             try
             {
@@ -447,13 +447,13 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredAssetResource> AddTag(s
                     var originalTags = GetTagResource().Get(cancellationToken);
                     originalTags.Value.Data.TagValues[key] = value;
                     GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken);
-                    var originalResponse = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                    return Response.FromValue(new DeviceRegistryNamespaceDiscoveredAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = _namespaceDiscoveredAssetRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                    return Response.FromValue(new NamespaceDiscoveredAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = Get(cancellationToken: cancellationToken).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDiscoveredAssetPatch();
+                    var patch = new NamespaceDiscoveredAssetPatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
@@ -487,18 +487,18 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredAssetResource> AddTag(s
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="tags"> The set of tags to use as replacement. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="tags"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResource>> SetTagsAsync(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDiscoveredAssetResource>> SetTagsAsync(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(tags, nameof(tags));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetResource.SetTags");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetResource.SetTags");
             scope.Start();
             try
             {
@@ -508,13 +508,13 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResourc
                     var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false);
                     originalTags.Value.Data.TagValues.ReplaceWith(tags);
                     await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    var originalResponse = await _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                    return Response.FromValue(new DeviceRegistryNamespaceDiscoveredAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = await _namespaceDiscoveredAssetRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                    return Response.FromValue(new NamespaceDiscoveredAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = (await GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false)).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDiscoveredAssetPatch();
+                    var patch = new NamespaceDiscoveredAssetPatch();
                     patch.Tags.ReplaceWith(tags);
                     var result = await UpdateAsync(WaitUntil.Completed, patch, cancellationToken: cancellationToken).ConfigureAwait(false);
                     return Response.FromValue(result.Value, result.GetRawResponse());
@@ -544,18 +544,18 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResourc
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="tags"> The set of tags to use as replacement. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="tags"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceDiscoveredAssetResource> SetTags(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDiscoveredAssetResource> SetTags(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(tags, nameof(tags));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetResource.SetTags");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetResource.SetTags");
             scope.Start();
             try
             {
@@ -565,13 +565,13 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredAssetResource> SetTags(
                     var originalTags = GetTagResource().Get(cancellationToken);
                     originalTags.Value.Data.TagValues.ReplaceWith(tags);
                     GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken);
-                    var originalResponse = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                    return Response.FromValue(new DeviceRegistryNamespaceDiscoveredAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = _namespaceDiscoveredAssetRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                    return Response.FromValue(new NamespaceDiscoveredAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = Get(cancellationToken: cancellationToken).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDiscoveredAssetPatch();
+                    var patch = new NamespaceDiscoveredAssetPatch();
                     patch.Tags.ReplaceWith(tags);
                     var result = Update(WaitUntil.Completed, patch, cancellationToken: cancellationToken);
                     return Response.FromValue(result.Value, result.GetRawResponse());
@@ -601,18 +601,18 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredAssetResource> SetTags(
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="key"> The key for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResource>> RemoveTagAsync(string key, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDiscoveredAssetResource>> RemoveTagAsync(string key, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetResource.RemoveTag");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetResource.RemoveTag");
             scope.Start();
             try
             {
@@ -621,13 +621,13 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResourc
                     var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false);
                     originalTags.Value.Data.TagValues.Remove(key);
                     await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    var originalResponse = await _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                    return Response.FromValue(new DeviceRegistryNamespaceDiscoveredAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = await _namespaceDiscoveredAssetRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                    return Response.FromValue(new NamespaceDiscoveredAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = (await GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false)).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDiscoveredAssetPatch();
+                    var patch = new NamespaceDiscoveredAssetPatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
@@ -661,18 +661,18 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResourc
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="key"> The key for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceDiscoveredAssetResource> RemoveTag(string key, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDiscoveredAssetResource> RemoveTag(string key, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredAssetResource.RemoveTag");
+            using var scope = _namespaceDiscoveredAssetClientDiagnostics.CreateScope("NamespaceDiscoveredAssetResource.RemoveTag");
             scope.Start();
             try
             {
@@ -681,13 +681,13 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredAssetResource> RemoveTa
                     var originalTags = GetTagResource().Get(cancellationToken);
                     originalTags.Value.Data.TagValues.Remove(key);
                     GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken);
-                    var originalResponse = _deviceRegistryNamespaceDiscoveredAssetNamespaceDiscoveredAssetsRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                    return Response.FromValue(new DeviceRegistryNamespaceDiscoveredAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = _namespaceDiscoveredAssetRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                    return Response.FromValue(new NamespaceDiscoveredAssetResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = Get(cancellationToken: cancellationToken).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDiscoveredAssetPatch();
+                    var patch = new NamespaceDiscoveredAssetPatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredDeviceCollection.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredDeviceCollection.cs
similarity index 60%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredDeviceCollection.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredDeviceCollection.cs
index 803c25c7734c..7bb01a2390b9 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredDeviceCollection.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredDeviceCollection.cs
@@ -18,28 +18,28 @@
 namespace Azure.ResourceManager.DeviceRegistry
 {
     /// <summary>
-    /// A class representing a collection of <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/> and their operations.
-    /// Each <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/> in the collection will belong to the same instance of <see cref="DeviceRegistryNamespaceResource"/>.
-    /// To get a <see cref="DeviceRegistryNamespaceDiscoveredDeviceCollection"/> instance call the GetDeviceRegistryNamespaceDiscoveredDevices method from an instance of <see cref="DeviceRegistryNamespaceResource"/>.
+    /// A class representing a collection of <see cref="NamespaceDiscoveredDeviceResource"/> and their operations.
+    /// Each <see cref="NamespaceDiscoveredDeviceResource"/> in the collection will belong to the same instance of <see cref="NamespaceResource"/>.
+    /// To get a <see cref="NamespaceDiscoveredDeviceCollection"/> instance call the GetNamespaceDiscoveredDevices method from an instance of <see cref="NamespaceResource"/>.
     /// </summary>
-    public partial class DeviceRegistryNamespaceDiscoveredDeviceCollection : ArmCollection, IEnumerable<DeviceRegistryNamespaceDiscoveredDeviceResource>, IAsyncEnumerable<DeviceRegistryNamespaceDiscoveredDeviceResource>
+    public partial class NamespaceDiscoveredDeviceCollection : ArmCollection, IEnumerable<NamespaceDiscoveredDeviceResource>, IAsyncEnumerable<NamespaceDiscoveredDeviceResource>
     {
-        private readonly ClientDiagnostics _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics;
-        private readonly NamespaceDiscoveredDevicesRestOperations _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient;
+        private readonly ClientDiagnostics _namespaceDiscoveredDeviceClientDiagnostics;
+        private readonly NamespaceDiscoveredDevicesRestOperations _namespaceDiscoveredDeviceRestClient;
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceDiscoveredDeviceCollection"/> class for mocking. </summary>
-        protected DeviceRegistryNamespaceDiscoveredDeviceCollection()
+        /// <summary> Initializes a new instance of the <see cref="NamespaceDiscoveredDeviceCollection"/> class for mocking. </summary>
+        protected NamespaceDiscoveredDeviceCollection()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceDiscoveredDeviceCollection"/> class. </summary>
+        /// <summary> Initializes a new instance of the <see cref="NamespaceDiscoveredDeviceCollection"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the parent resource that is the target of operations. </param>
-        internal DeviceRegistryNamespaceDiscoveredDeviceCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
+        internal NamespaceDiscoveredDeviceCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", DeviceRegistryNamespaceDiscoveredDeviceResource.ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(DeviceRegistryNamespaceDiscoveredDeviceResource.ResourceType, out string deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesApiVersion);
-            _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient = new NamespaceDiscoveredDevicesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesApiVersion);
+            _namespaceDiscoveredDeviceClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", NamespaceDiscoveredDeviceResource.ResourceType.Namespace, Diagnostics);
+            TryGetApiVersion(NamespaceDiscoveredDeviceResource.ResourceType, out string namespaceDiscoveredDeviceApiVersion);
+            _namespaceDiscoveredDeviceRestClient = new NamespaceDiscoveredDevicesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, namespaceDiscoveredDeviceApiVersion);
 #if DEBUG
 			ValidateResourceId(Id);
 #endif
@@ -47,8 +47,8 @@ internal DeviceRegistryNamespaceDiscoveredDeviceCollection(ArmClient client, Res
 
         internal static void ValidateResourceId(ResourceIdentifier id)
         {
-            if (id.ResourceType != DeviceRegistryNamespaceResource.ResourceType)
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, "Invalid resource type {0} expected {1}", id.ResourceType, DeviceRegistryNamespaceResource.ResourceType), nameof(id));
+            if (id.ResourceType != NamespaceResource.ResourceType)
+                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, "Invalid resource type {0} expected {1}", id.ResourceType, NamespaceResource.ResourceType), nameof(id));
         }
 
         /// <summary>
@@ -68,7 +68,7 @@ internal static void ValidateResourceId(ResourceIdentifier id)
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -78,17 +78,17 @@ internal static void ValidateResourceId(ResourceIdentifier id)
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="discoveredDeviceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredDeviceName"/> or <paramref name="data"/> is null. </exception>
-        public virtual async Task<ArmOperation<DeviceRegistryNamespaceDiscoveredDeviceResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string discoveredDeviceName, DeviceRegistryNamespaceDiscoveredDeviceData data, CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<NamespaceDiscoveredDeviceResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string discoveredDeviceName, NamespaceDiscoveredDeviceData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(discoveredDeviceName, nameof(discoveredDeviceName));
             Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceCollection.CreateOrUpdate");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.CreateOrReplaceAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, data, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceDiscoveredDeviceResource>(new DeviceRegistryNamespaceDiscoveredDeviceOperationSource(Client), _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics, Pipeline, _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                var response = await _namespaceDiscoveredDeviceRestClient.CreateOrReplaceAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, data, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation<NamespaceDiscoveredDeviceResource>(new NamespaceDiscoveredDeviceOperationSource(Client), _namespaceDiscoveredDeviceClientDiagnostics, Pipeline, _namespaceDiscoveredDeviceRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -117,7 +117,7 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceDiscoveredDeviceRe
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -127,17 +127,17 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceDiscoveredDeviceRe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="discoveredDeviceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredDeviceName"/> or <paramref name="data"/> is null. </exception>
-        public virtual ArmOperation<DeviceRegistryNamespaceDiscoveredDeviceResource> CreateOrUpdate(WaitUntil waitUntil, string discoveredDeviceName, DeviceRegistryNamespaceDiscoveredDeviceData data, CancellationToken cancellationToken = default)
+        public virtual ArmOperation<NamespaceDiscoveredDeviceResource> CreateOrUpdate(WaitUntil waitUntil, string discoveredDeviceName, NamespaceDiscoveredDeviceData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(discoveredDeviceName, nameof(discoveredDeviceName));
             Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceCollection.CreateOrUpdate");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.CreateOrReplace(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, data, cancellationToken);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceDiscoveredDeviceResource>(new DeviceRegistryNamespaceDiscoveredDeviceOperationSource(Client), _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics, Pipeline, _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                var response = _namespaceDiscoveredDeviceRestClient.CreateOrReplace(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, data, cancellationToken);
+                var operation = new DeviceRegistryArmOperation<NamespaceDiscoveredDeviceResource>(new NamespaceDiscoveredDeviceOperationSource(Client), _namespaceDiscoveredDeviceClientDiagnostics, Pipeline, _namespaceDiscoveredDeviceRestClient.CreateCreateOrReplaceRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletion(cancellationToken);
                 return operation;
@@ -166,7 +166,7 @@ public virtual ArmOperation<DeviceRegistryNamespaceDiscoveredDeviceResource> Cre
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -174,18 +174,18 @@ public virtual ArmOperation<DeviceRegistryNamespaceDiscoveredDeviceResource> Cre
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="discoveredDeviceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredDeviceName"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResource>> GetAsync(string discoveredDeviceName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDiscoveredDeviceResource>> GetAsync(string discoveredDeviceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(discoveredDeviceName, nameof(discoveredDeviceName));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceCollection.Get");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceCollection.Get");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceDiscoveredDeviceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, cancellationToken).ConfigureAwait(false);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDiscoveredDeviceResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceDiscoveredDeviceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -211,7 +211,7 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResour
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -219,18 +219,18 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="discoveredDeviceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredDeviceName"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceDiscoveredDeviceResource> Get(string discoveredDeviceName, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDiscoveredDeviceResource> Get(string discoveredDeviceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(discoveredDeviceName, nameof(discoveredDeviceName));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceCollection.Get");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceCollection.Get");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, cancellationToken);
+                var response = _namespaceDiscoveredDeviceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, cancellationToken);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDiscoveredDeviceResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceDiscoveredDeviceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -256,17 +256,17 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredDeviceResource> Get(str
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> An async collection of <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/> that may take multiple service requests to iterate over. </returns>
-        public virtual AsyncPageable<DeviceRegistryNamespaceDiscoveredDeviceResource> GetAllAsync(CancellationToken cancellationToken = default)
+        /// <returns> An async collection of <see cref="NamespaceDiscoveredDeviceResource"/> that may take multiple service requests to iterate over. </returns>
+        public virtual AsyncPageable<NamespaceDiscoveredDeviceResource> GetAllAsync(CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new DeviceRegistryNamespaceDiscoveredDeviceResource(Client, DeviceRegistryNamespaceDiscoveredDeviceData.DeserializeDeviceRegistryNamespaceDiscoveredDeviceData(e)), _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics, Pipeline, "DeviceRegistryNamespaceDiscoveredDeviceCollection.GetAll", "value", "nextLink", cancellationToken);
+            HttpMessage FirstPageRequest(int? pageSizeHint) => _namespaceDiscoveredDeviceRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _namespaceDiscoveredDeviceRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => new NamespaceDiscoveredDeviceResource(Client, NamespaceDiscoveredDeviceData.DeserializeNamespaceDiscoveredDeviceData(e)), _namespaceDiscoveredDeviceClientDiagnostics, Pipeline, "NamespaceDiscoveredDeviceCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -286,17 +286,17 @@ public virtual AsyncPageable<DeviceRegistryNamespaceDiscoveredDeviceResource> Ge
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> A collection of <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/> that may take multiple service requests to iterate over. </returns>
-        public virtual Pageable<DeviceRegistryNamespaceDiscoveredDeviceResource> GetAll(CancellationToken cancellationToken = default)
+        /// <returns> A collection of <see cref="NamespaceDiscoveredDeviceResource"/> that may take multiple service requests to iterate over. </returns>
+        public virtual Pageable<NamespaceDiscoveredDeviceResource> GetAll(CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
-            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new DeviceRegistryNamespaceDiscoveredDeviceResource(Client, DeviceRegistryNamespaceDiscoveredDeviceData.DeserializeDeviceRegistryNamespaceDiscoveredDeviceData(e)), _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics, Pipeline, "DeviceRegistryNamespaceDiscoveredDeviceCollection.GetAll", "value", "nextLink", cancellationToken);
+            HttpMessage FirstPageRequest(int? pageSizeHint) => _namespaceDiscoveredDeviceRestClient.CreateListByResourceGroupRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => _namespaceDiscoveredDeviceRestClient.CreateListByResourceGroupNextPageRequest(nextLink, Id.SubscriptionId, Id.ResourceGroupName, Id.Name);
+            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => new NamespaceDiscoveredDeviceResource(Client, NamespaceDiscoveredDeviceData.DeserializeNamespaceDiscoveredDeviceData(e)), _namespaceDiscoveredDeviceClientDiagnostics, Pipeline, "NamespaceDiscoveredDeviceCollection.GetAll", "value", "nextLink", cancellationToken);
         }
 
         /// <summary>
@@ -316,7 +316,7 @@ public virtual Pageable<DeviceRegistryNamespaceDiscoveredDeviceResource> GetAll(
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -328,11 +328,11 @@ public virtual async Task<Response<bool>> ExistsAsync(string discoveredDeviceNam
         {
             Argument.AssertNotNullOrEmpty(discoveredDeviceName, nameof(discoveredDeviceName));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceCollection.Exists");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceCollection.Exists");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceDiscoveredDeviceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, cancellationToken: cancellationToken).ConfigureAwait(false);
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -359,7 +359,7 @@ public virtual async Task<Response<bool>> ExistsAsync(string discoveredDeviceNam
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -371,11 +371,11 @@ public virtual Response<bool> Exists(string discoveredDeviceName, CancellationTo
         {
             Argument.AssertNotNullOrEmpty(discoveredDeviceName, nameof(discoveredDeviceName));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceCollection.Exists");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceCollection.Exists");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, cancellationToken: cancellationToken);
+                var response = _namespaceDiscoveredDeviceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, cancellationToken: cancellationToken);
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -402,7 +402,7 @@ public virtual Response<bool> Exists(string discoveredDeviceName, CancellationTo
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -410,18 +410,18 @@ public virtual Response<bool> Exists(string discoveredDeviceName, CancellationTo
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="discoveredDeviceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredDeviceName"/> is null. </exception>
-        public virtual async Task<NullableResponse<DeviceRegistryNamespaceDiscoveredDeviceResource>> GetIfExistsAsync(string discoveredDeviceName, CancellationToken cancellationToken = default)
+        public virtual async Task<NullableResponse<NamespaceDiscoveredDeviceResource>> GetIfExistsAsync(string discoveredDeviceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(discoveredDeviceName, nameof(discoveredDeviceName));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceCollection.GetIfExists");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceDiscoveredDeviceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, cancellationToken: cancellationToken).ConfigureAwait(false);
                 if (response.Value == null)
-                    return new NoValueResponse<DeviceRegistryNamespaceDiscoveredDeviceResource>(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDiscoveredDeviceResource(Client, response.Value), response.GetRawResponse());
+                    return new NoValueResponse<NamespaceDiscoveredDeviceResource>(response.GetRawResponse());
+                return Response.FromValue(new NamespaceDiscoveredDeviceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -447,7 +447,7 @@ public virtual async Task<NullableResponse<DeviceRegistryNamespaceDiscoveredDevi
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -455,18 +455,18 @@ public virtual async Task<NullableResponse<DeviceRegistryNamespaceDiscoveredDevi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentException"> <paramref name="discoveredDeviceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredDeviceName"/> is null. </exception>
-        public virtual NullableResponse<DeviceRegistryNamespaceDiscoveredDeviceResource> GetIfExists(string discoveredDeviceName, CancellationToken cancellationToken = default)
+        public virtual NullableResponse<NamespaceDiscoveredDeviceResource> GetIfExists(string discoveredDeviceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(discoveredDeviceName, nameof(discoveredDeviceName));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceCollection.GetIfExists");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, cancellationToken: cancellationToken);
+                var response = _namespaceDiscoveredDeviceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, discoveredDeviceName, cancellationToken: cancellationToken);
                 if (response.Value == null)
-                    return new NoValueResponse<DeviceRegistryNamespaceDiscoveredDeviceResource>(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDiscoveredDeviceResource(Client, response.Value), response.GetRawResponse());
+                    return new NoValueResponse<NamespaceDiscoveredDeviceResource>(response.GetRawResponse());
+                return Response.FromValue(new NamespaceDiscoveredDeviceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -475,7 +475,7 @@ public virtual NullableResponse<DeviceRegistryNamespaceDiscoveredDeviceResource>
             }
         }
 
-        IEnumerator<DeviceRegistryNamespaceDiscoveredDeviceResource> IEnumerable<DeviceRegistryNamespaceDiscoveredDeviceResource>.GetEnumerator()
+        IEnumerator<NamespaceDiscoveredDeviceResource> IEnumerable<NamespaceDiscoveredDeviceResource>.GetEnumerator()
         {
             return GetAll().GetEnumerator();
         }
@@ -485,7 +485,7 @@ IEnumerator IEnumerable.GetEnumerator()
             return GetAll().GetEnumerator();
         }
 
-        IAsyncEnumerator<DeviceRegistryNamespaceDiscoveredDeviceResource> IAsyncEnumerable<DeviceRegistryNamespaceDiscoveredDeviceResource>.GetAsyncEnumerator(CancellationToken cancellationToken)
+        IAsyncEnumerator<NamespaceDiscoveredDeviceResource> IAsyncEnumerable<NamespaceDiscoveredDeviceResource>.GetAsyncEnumerator(CancellationToken cancellationToken)
         {
             return GetAllAsync(cancellationToken: cancellationToken).GetAsyncEnumerator(cancellationToken);
         }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredDeviceData.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredDeviceData.Serialization.cs
similarity index 69%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredDeviceData.Serialization.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredDeviceData.Serialization.cs
index 4ec4decd55d6..06164da76dcd 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredDeviceData.Serialization.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredDeviceData.Serialization.cs
@@ -16,11 +16,11 @@
 
 namespace Azure.ResourceManager.DeviceRegistry
 {
-    public partial class DeviceRegistryNamespaceDiscoveredDeviceData : IUtf8JsonSerializable, IJsonModel<DeviceRegistryNamespaceDiscoveredDeviceData>
+    public partial class NamespaceDiscoveredDeviceData : IUtf8JsonSerializable, IJsonModel<NamespaceDiscoveredDeviceData>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DeviceRegistryNamespaceDiscoveredDeviceData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<NamespaceDiscoveredDeviceData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
 
-        void IJsonModel<DeviceRegistryNamespaceDiscoveredDeviceData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void IJsonModel<NamespaceDiscoveredDeviceData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -31,10 +31,10 @@ void IJsonModel<DeviceRegistryNamespaceDiscoveredDeviceData>.Write(Utf8JsonWrite
         /// <param name="options"> The client options for reading and writing models. </param>
         protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredDeviceData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredDeviceData)} does not support writing '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDiscoveredDeviceData)} does not support writing '{format}' format.");
             }
 
             base.JsonModelWriteCore(writer, options);
@@ -47,19 +47,19 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri
             writer.WriteObjectValue(ExtendedLocation, options);
         }
 
-        DeviceRegistryNamespaceDiscoveredDeviceData IJsonModel<DeviceRegistryNamespaceDiscoveredDeviceData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        NamespaceDiscoveredDeviceData IJsonModel<NamespaceDiscoveredDeviceData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredDeviceData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
-                throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredDeviceData)} does not support reading '{format}' format.");
+                throw new FormatException($"The model {nameof(NamespaceDiscoveredDeviceData)} does not support reading '{format}' format.");
             }
 
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeDeviceRegistryNamespaceDiscoveredDeviceData(document.RootElement, options);
+            return DeserializeNamespaceDiscoveredDeviceData(document.RootElement, options);
         }
 
-        internal static DeviceRegistryNamespaceDiscoveredDeviceData DeserializeDeviceRegistryNamespaceDiscoveredDeviceData(JsonElement element, ModelReaderWriterOptions options = null)
+        internal static NamespaceDiscoveredDeviceData DeserializeNamespaceDiscoveredDeviceData(JsonElement element, ModelReaderWriterOptions options = null)
         {
             options ??= ModelSerializationExtensions.WireOptions;
 
@@ -67,7 +67,7 @@ internal static DeviceRegistryNamespaceDiscoveredDeviceData DeserializeDeviceReg
             {
                 return null;
             }
-            DeviceRegistryNamespaceDiscoveredDeviceProperties properties = default;
+            NamespaceDiscoveredDeviceProperties properties = default;
             DeviceRegistryExtendedLocation extendedLocation = default;
             IDictionary<string, string> tags = default;
             AzureLocation location = default;
@@ -85,7 +85,7 @@ internal static DeviceRegistryNamespaceDiscoveredDeviceData DeserializeDeviceReg
                     {
                         continue;
                     }
-                    properties = DeviceRegistryNamespaceDiscoveredDeviceProperties.DeserializeDeviceRegistryNamespaceDiscoveredDeviceProperties(property.Value, options);
+                    properties = NamespaceDiscoveredDeviceProperties.DeserializeNamespaceDiscoveredDeviceProperties(property.Value, options);
                     continue;
                 }
                 if (property.NameEquals("extendedLocation"u8))
@@ -142,7 +142,7 @@ internal static DeviceRegistryNamespaceDiscoveredDeviceData DeserializeDeviceReg
                 }
             }
             serializedAdditionalRawData = rawDataDictionary;
-            return new DeviceRegistryNamespaceDiscoveredDeviceData(
+            return new NamespaceDiscoveredDeviceData(
                 id,
                 name,
                 type,
@@ -154,35 +154,35 @@ internal static DeviceRegistryNamespaceDiscoveredDeviceData DeserializeDeviceReg
                 serializedAdditionalRawData);
         }
 
-        BinaryData IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceData>.Write(ModelReaderWriterOptions options)
+        BinaryData IPersistableModel<NamespaceDiscoveredDeviceData>.Write(ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredDeviceData>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     return ModelReaderWriter.Write(this, options, AzureResourceManagerDeviceRegistryContext.Default);
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredDeviceData)} does not support writing '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDiscoveredDeviceData)} does not support writing '{options.Format}' format.");
             }
         }
 
-        DeviceRegistryNamespaceDiscoveredDeviceData IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceData>.Create(BinaryData data, ModelReaderWriterOptions options)
+        NamespaceDiscoveredDeviceData IPersistableModel<NamespaceDiscoveredDeviceData>.Create(BinaryData data, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceData>)this).GetFormatFromOptions(options) : options.Format;
+            var format = options.Format == "W" ? ((IPersistableModel<NamespaceDiscoveredDeviceData>)this).GetFormatFromOptions(options) : options.Format;
 
             switch (format)
             {
                 case "J":
                     {
                         using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeDeviceRegistryNamespaceDiscoveredDeviceData(document.RootElement, options);
+                        return DeserializeNamespaceDiscoveredDeviceData(document.RootElement, options);
                     }
                 default:
-                    throw new FormatException($"The model {nameof(DeviceRegistryNamespaceDiscoveredDeviceData)} does not support reading '{options.Format}' format.");
+                    throw new FormatException($"The model {nameof(NamespaceDiscoveredDeviceData)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<DeviceRegistryNamespaceDiscoveredDeviceData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<NamespaceDiscoveredDeviceData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredDeviceData.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredDeviceData.cs
similarity index 71%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredDeviceData.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredDeviceData.cs
index 3baa59b0e927..36c11b2d5ff8 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredDeviceData.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredDeviceData.cs
@@ -14,10 +14,10 @@
 namespace Azure.ResourceManager.DeviceRegistry
 {
     /// <summary>
-    /// A class representing the DeviceRegistryNamespaceDiscoveredDevice data model.
+    /// A class representing the NamespaceDiscoveredDevice data model.
     /// Discovered device definition.
     /// </summary>
-    public partial class DeviceRegistryNamespaceDiscoveredDeviceData : TrackedResourceData
+    public partial class NamespaceDiscoveredDeviceData : TrackedResourceData
     {
         /// <summary>
         /// Keeps track of any properties unknown to the library.
@@ -51,18 +51,18 @@ public partial class DeviceRegistryNamespaceDiscoveredDeviceData : TrackedResour
         /// </summary>
         private IDictionary<string, BinaryData> _serializedAdditionalRawData;
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredDeviceData"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredDeviceData"/>. </summary>
         /// <param name="location"> The location. </param>
         /// <param name="extendedLocation"> The extended location. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="extendedLocation"/> is null. </exception>
-        public DeviceRegistryNamespaceDiscoveredDeviceData(AzureLocation location, DeviceRegistryExtendedLocation extendedLocation) : base(location)
+        public NamespaceDiscoveredDeviceData(AzureLocation location, DeviceRegistryExtendedLocation extendedLocation) : base(location)
         {
             Argument.AssertNotNull(extendedLocation, nameof(extendedLocation));
 
             ExtendedLocation = extendedLocation;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredDeviceData"/>. </summary>
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredDeviceData"/>. </summary>
         /// <param name="id"> The id. </param>
         /// <param name="name"> The name. </param>
         /// <param name="resourceType"> The resourceType. </param>
@@ -72,20 +72,20 @@ public DeviceRegistryNamespaceDiscoveredDeviceData(AzureLocation location, Devic
         /// <param name="properties"> The resource-specific properties for this resource. </param>
         /// <param name="extendedLocation"> The extended location. </param>
         /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DeviceRegistryNamespaceDiscoveredDeviceData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, string> tags, AzureLocation location, DeviceRegistryNamespaceDiscoveredDeviceProperties properties, DeviceRegistryExtendedLocation extendedLocation, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData, tags, location)
+        internal NamespaceDiscoveredDeviceData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, string> tags, AzureLocation location, NamespaceDiscoveredDeviceProperties properties, DeviceRegistryExtendedLocation extendedLocation, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData, tags, location)
         {
             Properties = properties;
             ExtendedLocation = extendedLocation;
             _serializedAdditionalRawData = serializedAdditionalRawData;
         }
 
-        /// <summary> Initializes a new instance of <see cref="DeviceRegistryNamespaceDiscoveredDeviceData"/> for deserialization. </summary>
-        internal DeviceRegistryNamespaceDiscoveredDeviceData()
+        /// <summary> Initializes a new instance of <see cref="NamespaceDiscoveredDeviceData"/> for deserialization. </summary>
+        internal NamespaceDiscoveredDeviceData()
         {
         }
 
         /// <summary> The resource-specific properties for this resource. </summary>
-        public DeviceRegistryNamespaceDiscoveredDeviceProperties Properties { get; set; }
+        public NamespaceDiscoveredDeviceProperties Properties { get; set; }
         /// <summary> The extended location. </summary>
         public DeviceRegistryExtendedLocation ExtendedLocation { get; set; }
     }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredDeviceResource.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredDeviceResource.Serialization.cs
new file mode 100644
index 000000000000..292d732f8cc6
--- /dev/null
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredDeviceResource.Serialization.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+
+namespace Azure.ResourceManager.DeviceRegistry
+{
+    public partial class NamespaceDiscoveredDeviceResource : IJsonModel<NamespaceDiscoveredDeviceData>
+    {
+        private static NamespaceDiscoveredDeviceData s_dataDeserializationInstance;
+        private static NamespaceDiscoveredDeviceData DataDeserializationInstance => s_dataDeserializationInstance ??= new();
+
+        void IJsonModel<NamespaceDiscoveredDeviceData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<NamespaceDiscoveredDeviceData>)Data).Write(writer, options);
+
+        NamespaceDiscoveredDeviceData IJsonModel<NamespaceDiscoveredDeviceData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => ((IJsonModel<NamespaceDiscoveredDeviceData>)DataDeserializationInstance).Create(ref reader, options);
+
+        BinaryData IPersistableModel<NamespaceDiscoveredDeviceData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<NamespaceDiscoveredDeviceData>(Data, options, AzureResourceManagerDeviceRegistryContext.Default);
+
+        NamespaceDiscoveredDeviceData IPersistableModel<NamespaceDiscoveredDeviceData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<NamespaceDiscoveredDeviceData>(data, options, AzureResourceManagerDeviceRegistryContext.Default);
+
+        string IPersistableModel<NamespaceDiscoveredDeviceData>.GetFormatFromOptions(ModelReaderWriterOptions options) => ((IPersistableModel<NamespaceDiscoveredDeviceData>)DataDeserializationInstance).GetFormatFromOptions(options);
+    }
+}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredDeviceResource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredDeviceResource.cs
similarity index 67%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredDeviceResource.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredDeviceResource.cs
index 79166324e119..64d15f8a690d 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceDiscoveredDeviceResource.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceDiscoveredDeviceResource.cs
@@ -17,14 +17,14 @@
 namespace Azure.ResourceManager.DeviceRegistry
 {
     /// <summary>
-    /// A Class representing a DeviceRegistryNamespaceDiscoveredDevice along with the instance operations that can be performed on it.
-    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/>
-    /// from an instance of <see cref="ArmClient"/> using the GetDeviceRegistryNamespaceDiscoveredDeviceResource method.
-    /// Otherwise you can get one from its parent resource <see cref="DeviceRegistryNamespaceResource"/> using the GetDeviceRegistryNamespaceDiscoveredDevice method.
+    /// A Class representing a NamespaceDiscoveredDevice along with the instance operations that can be performed on it.
+    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="NamespaceDiscoveredDeviceResource"/>
+    /// from an instance of <see cref="ArmClient"/> using the GetNamespaceDiscoveredDeviceResource method.
+    /// Otherwise you can get one from its parent resource <see cref="NamespaceResource"/> using the GetNamespaceDiscoveredDevice method.
     /// </summary>
-    public partial class DeviceRegistryNamespaceDiscoveredDeviceResource : ArmResource
+    public partial class NamespaceDiscoveredDeviceResource : ArmResource
     {
-        /// <summary> Generate the resource identifier of a <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/> instance. </summary>
+        /// <summary> Generate the resource identifier of a <see cref="NamespaceDiscoveredDeviceResource"/> instance. </summary>
         /// <param name="subscriptionId"> The subscriptionId. </param>
         /// <param name="resourceGroupName"> The resourceGroupName. </param>
         /// <param name="namespaceName"> The namespaceName. </param>
@@ -35,35 +35,35 @@ public static ResourceIdentifier CreateResourceIdentifier(string subscriptionId,
             return new ResourceIdentifier(resourceId);
         }
 
-        private readonly ClientDiagnostics _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics;
-        private readonly NamespaceDiscoveredDevicesRestOperations _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient;
-        private readonly DeviceRegistryNamespaceDiscoveredDeviceData _data;
+        private readonly ClientDiagnostics _namespaceDiscoveredDeviceClientDiagnostics;
+        private readonly NamespaceDiscoveredDevicesRestOperations _namespaceDiscoveredDeviceRestClient;
+        private readonly NamespaceDiscoveredDeviceData _data;
 
         /// <summary> Gets the resource type for the operations. </summary>
         public static readonly ResourceType ResourceType = "Microsoft.DeviceRegistry/namespaces/discoveredDevices";
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/> class for mocking. </summary>
-        protected DeviceRegistryNamespaceDiscoveredDeviceResource()
+        /// <summary> Initializes a new instance of the <see cref="NamespaceDiscoveredDeviceResource"/> class for mocking. </summary>
+        protected NamespaceDiscoveredDeviceResource()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/> class. </summary>
+        /// <summary> Initializes a new instance of the <see cref="NamespaceDiscoveredDeviceResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="data"> The resource that is the target of operations. </param>
-        internal DeviceRegistryNamespaceDiscoveredDeviceResource(ArmClient client, DeviceRegistryNamespaceDiscoveredDeviceData data) : this(client, data.Id)
+        internal NamespaceDiscoveredDeviceResource(ArmClient client, NamespaceDiscoveredDeviceData data) : this(client, data.Id)
         {
             HasData = true;
             _data = data;
         }
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/> class. </summary>
+        /// <summary> Initializes a new instance of the <see cref="NamespaceDiscoveredDeviceResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the resource that is the target of operations. </param>
-        internal DeviceRegistryNamespaceDiscoveredDeviceResource(ArmClient client, ResourceIdentifier id) : base(client, id)
+        internal NamespaceDiscoveredDeviceResource(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(ResourceType, out string deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesApiVersion);
-            _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient = new NamespaceDiscoveredDevicesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesApiVersion);
+            _namespaceDiscoveredDeviceClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", ResourceType.Namespace, Diagnostics);
+            TryGetApiVersion(ResourceType, out string namespaceDiscoveredDeviceApiVersion);
+            _namespaceDiscoveredDeviceRestClient = new NamespaceDiscoveredDevicesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, namespaceDiscoveredDeviceApiVersion);
 #if DEBUG
 			ValidateResourceId(Id);
 #endif
@@ -74,7 +74,7 @@ internal DeviceRegistryNamespaceDiscoveredDeviceResource(ArmClient client, Resou
 
         /// <summary> Gets the data representing this Feature. </summary>
         /// <exception cref="InvalidOperationException"> Throws if there is no data loaded in the current instance. </exception>
-        public virtual DeviceRegistryNamespaceDiscoveredDeviceData Data
+        public virtual NamespaceDiscoveredDeviceData Data
         {
             get
             {
@@ -107,21 +107,21 @@ internal static void ValidateResourceId(ResourceIdentifier id)
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResource>> GetAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDiscoveredDeviceResource>> GetAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceResource.Get");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceResource.Get");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceDiscoveredDeviceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDiscoveredDeviceResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceDiscoveredDeviceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -147,21 +147,21 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResour
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual Response<DeviceRegistryNamespaceDiscoveredDeviceResource> Get(CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDiscoveredDeviceResource> Get(CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceResource.Get");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceResource.Get");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                var response = _namespaceDiscoveredDeviceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceDiscoveredDeviceResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceDiscoveredDeviceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -187,7 +187,7 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredDeviceResource> Get(Can
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -195,12 +195,12 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredDeviceResource> Get(Can
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<ArmOperation> DeleteAsync(WaitUntil waitUntil, CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceResource.Delete");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceResource.Delete");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.DeleteAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation(_deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics, Pipeline, _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
+                var response = await _namespaceDiscoveredDeviceRestClient.DeleteAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation(_namespaceDiscoveredDeviceClientDiagnostics, Pipeline, _namespaceDiscoveredDeviceRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionResponseAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -229,7 +229,7 @@ public virtual async Task<ArmOperation> DeleteAsync(WaitUntil waitUntil, Cancell
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -237,12 +237,12 @@ public virtual async Task<ArmOperation> DeleteAsync(WaitUntil waitUntil, Cancell
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceResource.Delete");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceResource.Delete");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.Delete(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                var operation = new DeviceRegistryArmOperation(_deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics, Pipeline, _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
+                var response = _namespaceDiscoveredDeviceRestClient.Delete(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                var operation = new DeviceRegistryArmOperation(_namespaceDiscoveredDeviceClientDiagnostics, Pipeline, _namespaceDiscoveredDeviceRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletionResponse(cancellationToken);
                 return operation;
@@ -271,7 +271,7 @@ public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancel
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -279,16 +279,16 @@ public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancel
         /// <param name="patch"> The resource properties to be updated. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="patch"/> is null. </exception>
-        public virtual async Task<ArmOperation<DeviceRegistryNamespaceDiscoveredDeviceResource>> UpdateAsync(WaitUntil waitUntil, DeviceRegistryNamespaceDiscoveredDevicePatch patch, CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<NamespaceDiscoveredDeviceResource>> UpdateAsync(WaitUntil waitUntil, NamespaceDiscoveredDevicePatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(patch, nameof(patch));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceResource.Update");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceResource.Update");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceDiscoveredDeviceResource>(new DeviceRegistryNamespaceDiscoveredDeviceOperationSource(Client), _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics, Pipeline, _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
+                var response = await _namespaceDiscoveredDeviceRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation<NamespaceDiscoveredDeviceResource>(new NamespaceDiscoveredDeviceOperationSource(Client), _namespaceDiscoveredDeviceClientDiagnostics, Pipeline, _namespaceDiscoveredDeviceRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -317,7 +317,7 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceDiscoveredDeviceRe
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -325,16 +325,16 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceDiscoveredDeviceRe
         /// <param name="patch"> The resource properties to be updated. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="patch"/> is null. </exception>
-        public virtual ArmOperation<DeviceRegistryNamespaceDiscoveredDeviceResource> Update(WaitUntil waitUntil, DeviceRegistryNamespaceDiscoveredDevicePatch patch, CancellationToken cancellationToken = default)
+        public virtual ArmOperation<NamespaceDiscoveredDeviceResource> Update(WaitUntil waitUntil, NamespaceDiscoveredDevicePatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(patch, nameof(patch));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceResource.Update");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceResource.Update");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceDiscoveredDeviceResource>(new DeviceRegistryNamespaceDiscoveredDeviceOperationSource(Client), _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics, Pipeline, _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
+                var response = _namespaceDiscoveredDeviceRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch, cancellationToken);
+                var operation = new DeviceRegistryArmOperation<NamespaceDiscoveredDeviceResource>(new NamespaceDiscoveredDeviceOperationSource(Client), _namespaceDiscoveredDeviceClientDiagnostics, Pipeline, _namespaceDiscoveredDeviceRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletion(cancellationToken);
                 return operation;
@@ -363,7 +363,7 @@ public virtual ArmOperation<DeviceRegistryNamespaceDiscoveredDeviceResource> Upd
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -371,12 +371,12 @@ public virtual ArmOperation<DeviceRegistryNamespaceDiscoveredDeviceResource> Upd
         /// <param name="value"> The value for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> or <paramref name="value"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResource>> AddTagAsync(string key, string value, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDiscoveredDeviceResource>> AddTagAsync(string key, string value, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
             Argument.AssertNotNull(value, nameof(value));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceResource.AddTag");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceResource.AddTag");
             scope.Start();
             try
             {
@@ -385,13 +385,13 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResour
                     var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false);
                     originalTags.Value.Data.TagValues[key] = value;
                     await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    var originalResponse = await _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                    return Response.FromValue(new DeviceRegistryNamespaceDiscoveredDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = await _namespaceDiscoveredDeviceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                    return Response.FromValue(new NamespaceDiscoveredDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = (await GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false)).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDiscoveredDevicePatch();
+                    var patch = new NamespaceDiscoveredDevicePatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
@@ -425,7 +425,7 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResour
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -433,12 +433,12 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResour
         /// <param name="value"> The value for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> or <paramref name="value"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceDiscoveredDeviceResource> AddTag(string key, string value, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDiscoveredDeviceResource> AddTag(string key, string value, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
             Argument.AssertNotNull(value, nameof(value));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceResource.AddTag");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceResource.AddTag");
             scope.Start();
             try
             {
@@ -447,13 +447,13 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredDeviceResource> AddTag(
                     var originalTags = GetTagResource().Get(cancellationToken);
                     originalTags.Value.Data.TagValues[key] = value;
                     GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken);
-                    var originalResponse = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                    return Response.FromValue(new DeviceRegistryNamespaceDiscoveredDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = _namespaceDiscoveredDeviceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                    return Response.FromValue(new NamespaceDiscoveredDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = Get(cancellationToken: cancellationToken).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDiscoveredDevicePatch();
+                    var patch = new NamespaceDiscoveredDevicePatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
@@ -487,18 +487,18 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredDeviceResource> AddTag(
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="tags"> The set of tags to use as replacement. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="tags"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResource>> SetTagsAsync(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDiscoveredDeviceResource>> SetTagsAsync(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(tags, nameof(tags));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceResource.SetTags");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceResource.SetTags");
             scope.Start();
             try
             {
@@ -508,13 +508,13 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResour
                     var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false);
                     originalTags.Value.Data.TagValues.ReplaceWith(tags);
                     await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    var originalResponse = await _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                    return Response.FromValue(new DeviceRegistryNamespaceDiscoveredDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = await _namespaceDiscoveredDeviceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                    return Response.FromValue(new NamespaceDiscoveredDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = (await GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false)).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDiscoveredDevicePatch();
+                    var patch = new NamespaceDiscoveredDevicePatch();
                     patch.Tags.ReplaceWith(tags);
                     var result = await UpdateAsync(WaitUntil.Completed, patch, cancellationToken: cancellationToken).ConfigureAwait(false);
                     return Response.FromValue(result.Value, result.GetRawResponse());
@@ -544,18 +544,18 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResour
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="tags"> The set of tags to use as replacement. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="tags"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceDiscoveredDeviceResource> SetTags(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDiscoveredDeviceResource> SetTags(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(tags, nameof(tags));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceResource.SetTags");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceResource.SetTags");
             scope.Start();
             try
             {
@@ -565,13 +565,13 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredDeviceResource> SetTags
                     var originalTags = GetTagResource().Get(cancellationToken);
                     originalTags.Value.Data.TagValues.ReplaceWith(tags);
                     GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken);
-                    var originalResponse = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                    return Response.FromValue(new DeviceRegistryNamespaceDiscoveredDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = _namespaceDiscoveredDeviceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                    return Response.FromValue(new NamespaceDiscoveredDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = Get(cancellationToken: cancellationToken).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDiscoveredDevicePatch();
+                    var patch = new NamespaceDiscoveredDevicePatch();
                     patch.Tags.ReplaceWith(tags);
                     var result = Update(WaitUntil.Completed, patch, cancellationToken: cancellationToken);
                     return Response.FromValue(result.Value, result.GetRawResponse());
@@ -601,18 +601,18 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredDeviceResource> SetTags
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="key"> The key for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResource>> RemoveTagAsync(string key, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDiscoveredDeviceResource>> RemoveTagAsync(string key, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceResource.RemoveTag");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceResource.RemoveTag");
             scope.Start();
             try
             {
@@ -621,13 +621,13 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResour
                     var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false);
                     originalTags.Value.Data.TagValues.Remove(key);
                     await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    var originalResponse = await _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
-                    return Response.FromValue(new DeviceRegistryNamespaceDiscoveredDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = await _namespaceDiscoveredDeviceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken).ConfigureAwait(false);
+                    return Response.FromValue(new NamespaceDiscoveredDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = (await GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false)).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDiscoveredDevicePatch();
+                    var patch = new NamespaceDiscoveredDevicePatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
@@ -661,18 +661,18 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResour
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="key"> The key for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceDiscoveredDeviceResource> RemoveTag(string key, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDiscoveredDeviceResource> RemoveTag(string key, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
 
-            using var scope = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesClientDiagnostics.CreateScope("DeviceRegistryNamespaceDiscoveredDeviceResource.RemoveTag");
+            using var scope = _namespaceDiscoveredDeviceClientDiagnostics.CreateScope("NamespaceDiscoveredDeviceResource.RemoveTag");
             scope.Start();
             try
             {
@@ -681,13 +681,13 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredDeviceResource> RemoveT
                     var originalTags = GetTagResource().Get(cancellationToken);
                     originalTags.Value.Data.TagValues.Remove(key);
                     GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken);
-                    var originalResponse = _deviceRegistryNamespaceDiscoveredDeviceNamespaceDiscoveredDevicesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
-                    return Response.FromValue(new DeviceRegistryNamespaceDiscoveredDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = _namespaceDiscoveredDeviceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Parent.Name, Id.Name, cancellationToken);
+                    return Response.FromValue(new NamespaceDiscoveredDeviceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = Get(cancellationToken: cancellationToken).Value.Data;
-                    var patch = new DeviceRegistryNamespaceDiscoveredDevicePatch();
+                    var patch = new NamespaceDiscoveredDevicePatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceResource.Serialization.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceResource.Serialization.cs
new file mode 100644
index 000000000000..d2e911e17559
--- /dev/null
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceResource.Serialization.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+
+namespace Azure.ResourceManager.DeviceRegistry
+{
+    public partial class NamespaceResource : IJsonModel<NamespaceData>
+    {
+        private static NamespaceData s_dataDeserializationInstance;
+        private static NamespaceData DataDeserializationInstance => s_dataDeserializationInstance ??= new();
+
+        void IJsonModel<NamespaceData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<NamespaceData>)Data).Write(writer, options);
+
+        NamespaceData IJsonModel<NamespaceData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => ((IJsonModel<NamespaceData>)DataDeserializationInstance).Create(ref reader, options);
+
+        BinaryData IPersistableModel<NamespaceData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<NamespaceData>(Data, options, AzureResourceManagerDeviceRegistryContext.Default);
+
+        NamespaceData IPersistableModel<NamespaceData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<NamespaceData>(data, options, AzureResourceManagerDeviceRegistryContext.Default);
+
+        string IPersistableModel<NamespaceData>.GetFormatFromOptions(ModelReaderWriterOptions options) => ((IPersistableModel<NamespaceData>)DataDeserializationInstance).GetFormatFromOptions(options);
+    }
+}
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceResource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceResource.cs
similarity index 70%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceResource.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceResource.cs
index 6481e2da66dd..969f7be34951 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/DeviceRegistryNamespaceResource.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/NamespaceResource.cs
@@ -18,14 +18,14 @@
 namespace Azure.ResourceManager.DeviceRegistry
 {
     /// <summary>
-    /// A Class representing a DeviceRegistryNamespace along with the instance operations that can be performed on it.
-    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="DeviceRegistryNamespaceResource"/>
-    /// from an instance of <see cref="ArmClient"/> using the GetDeviceRegistryNamespaceResource method.
-    /// Otherwise you can get one from its parent resource <see cref="ResourceGroupResource"/> using the GetDeviceRegistryNamespace method.
+    /// A Class representing a Namespace along with the instance operations that can be performed on it.
+    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="NamespaceResource"/>
+    /// from an instance of <see cref="ArmClient"/> using the GetNamespaceResource method.
+    /// Otherwise you can get one from its parent resource <see cref="ResourceGroupResource"/> using the GetNamespace method.
     /// </summary>
-    public partial class DeviceRegistryNamespaceResource : ArmResource
+    public partial class NamespaceResource : ArmResource
     {
-        /// <summary> Generate the resource identifier of a <see cref="DeviceRegistryNamespaceResource"/> instance. </summary>
+        /// <summary> Generate the resource identifier of a <see cref="NamespaceResource"/> instance. </summary>
         /// <param name="subscriptionId"> The subscriptionId. </param>
         /// <param name="resourceGroupName"> The resourceGroupName. </param>
         /// <param name="namespaceName"> The namespaceName. </param>
@@ -35,35 +35,35 @@ public static ResourceIdentifier CreateResourceIdentifier(string subscriptionId,
             return new ResourceIdentifier(resourceId);
         }
 
-        private readonly ClientDiagnostics _deviceRegistryNamespaceNamespacesClientDiagnostics;
-        private readonly NamespacesRestOperations _deviceRegistryNamespaceNamespacesRestClient;
-        private readonly DeviceRegistryNamespaceData _data;
+        private readonly ClientDiagnostics _namespaceClientDiagnostics;
+        private readonly NamespacesRestOperations _namespaceRestClient;
+        private readonly NamespaceData _data;
 
         /// <summary> Gets the resource type for the operations. </summary>
         public static readonly ResourceType ResourceType = "Microsoft.DeviceRegistry/namespaces";
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceResource"/> class for mocking. </summary>
-        protected DeviceRegistryNamespaceResource()
+        /// <summary> Initializes a new instance of the <see cref="NamespaceResource"/> class for mocking. </summary>
+        protected NamespaceResource()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceResource"/> class. </summary>
+        /// <summary> Initializes a new instance of the <see cref="NamespaceResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="data"> The resource that is the target of operations. </param>
-        internal DeviceRegistryNamespaceResource(ArmClient client, DeviceRegistryNamespaceData data) : this(client, data.Id)
+        internal NamespaceResource(ArmClient client, NamespaceData data) : this(client, data.Id)
         {
             HasData = true;
             _data = data;
         }
 
-        /// <summary> Initializes a new instance of the <see cref="DeviceRegistryNamespaceResource"/> class. </summary>
+        /// <summary> Initializes a new instance of the <see cref="NamespaceResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the resource that is the target of operations. </param>
-        internal DeviceRegistryNamespaceResource(ArmClient client, ResourceIdentifier id) : base(client, id)
+        internal NamespaceResource(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _deviceRegistryNamespaceNamespacesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(ResourceType, out string deviceRegistryNamespaceNamespacesApiVersion);
-            _deviceRegistryNamespaceNamespacesRestClient = new NamespacesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, deviceRegistryNamespaceNamespacesApiVersion);
+            _namespaceClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.DeviceRegistry", ResourceType.Namespace, Diagnostics);
+            TryGetApiVersion(ResourceType, out string namespaceApiVersion);
+            _namespaceRestClient = new NamespacesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, namespaceApiVersion);
 #if DEBUG
 			ValidateResourceId(Id);
 #endif
@@ -74,7 +74,7 @@ internal DeviceRegistryNamespaceResource(ArmClient client, ResourceIdentifier id
 
         /// <summary> Gets the data representing this Feature. </summary>
         /// <exception cref="InvalidOperationException"> Throws if there is no data loaded in the current instance. </exception>
-        public virtual DeviceRegistryNamespaceData Data
+        public virtual NamespaceData Data
         {
             get
             {
@@ -90,11 +90,11 @@ internal static void ValidateResourceId(ResourceIdentifier id)
                 throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, "Invalid resource type {0} expected {1}", id.ResourceType, ResourceType), nameof(id));
         }
 
-        /// <summary> Gets a collection of DeviceRegistryNamespaceAssetResources in the DeviceRegistryNamespace. </summary>
-        /// <returns> An object representing collection of DeviceRegistryNamespaceAssetResources and their operations over a DeviceRegistryNamespaceAssetResource. </returns>
-        public virtual DeviceRegistryNamespaceAssetCollection GetDeviceRegistryNamespaceAssets()
+        /// <summary> Gets a collection of NamespaceAssetResources in the Namespace. </summary>
+        /// <returns> An object representing collection of NamespaceAssetResources and their operations over a NamespaceAssetResource. </returns>
+        public virtual NamespaceAssetCollection GetNamespaceAssets()
         {
-            return GetCachedClient(client => new DeviceRegistryNamespaceAssetCollection(client, Id));
+            return GetCachedClient(client => new NamespaceAssetCollection(client, Id));
         }
 
         /// <summary>
@@ -114,7 +114,7 @@ public virtual DeviceRegistryNamespaceAssetCollection GetDeviceRegistryNamespace
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -123,9 +123,9 @@ public virtual DeviceRegistryNamespaceAssetCollection GetDeviceRegistryNamespace
         /// <exception cref="ArgumentNullException"> <paramref name="assetName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="assetName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> GetDeviceRegistryNamespaceAssetAsync(string assetName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceAssetResource>> GetNamespaceAssetAsync(string assetName, CancellationToken cancellationToken = default)
         {
-            return await GetDeviceRegistryNamespaceAssets().GetAsync(assetName, cancellationToken).ConfigureAwait(false);
+            return await GetNamespaceAssets().GetAsync(assetName, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -145,7 +145,7 @@ public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> GetDev
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceAssetResource"/></description>
+        /// <description><see cref="NamespaceAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -154,16 +154,16 @@ public virtual async Task<Response<DeviceRegistryNamespaceAssetResource>> GetDev
         /// <exception cref="ArgumentNullException"> <paramref name="assetName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="assetName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual Response<DeviceRegistryNamespaceAssetResource> GetDeviceRegistryNamespaceAsset(string assetName, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceAssetResource> GetNamespaceAsset(string assetName, CancellationToken cancellationToken = default)
         {
-            return GetDeviceRegistryNamespaceAssets().Get(assetName, cancellationToken);
+            return GetNamespaceAssets().Get(assetName, cancellationToken);
         }
 
-        /// <summary> Gets a collection of DeviceRegistryNamespaceDeviceResources in the DeviceRegistryNamespace. </summary>
-        /// <returns> An object representing collection of DeviceRegistryNamespaceDeviceResources and their operations over a DeviceRegistryNamespaceDeviceResource. </returns>
-        public virtual DeviceRegistryNamespaceDeviceCollection GetDeviceRegistryNamespaceDevices()
+        /// <summary> Gets a collection of NamespaceDeviceResources in the Namespace. </summary>
+        /// <returns> An object representing collection of NamespaceDeviceResources and their operations over a NamespaceDeviceResource. </returns>
+        public virtual NamespaceDeviceCollection GetNamespaceDevices()
         {
-            return GetCachedClient(client => new DeviceRegistryNamespaceDeviceCollection(client, Id));
+            return GetCachedClient(client => new NamespaceDeviceCollection(client, Id));
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public virtual DeviceRegistryNamespaceDeviceCollection GetDeviceRegistryNamespac
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -192,9 +192,9 @@ public virtual DeviceRegistryNamespaceDeviceCollection GetDeviceRegistryNamespac
         /// <exception cref="ArgumentNullException"> <paramref name="deviceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="deviceName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> GetDeviceRegistryNamespaceDeviceAsync(string deviceName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDeviceResource>> GetNamespaceDeviceAsync(string deviceName, CancellationToken cancellationToken = default)
         {
-            return await GetDeviceRegistryNamespaceDevices().GetAsync(deviceName, cancellationToken).ConfigureAwait(false);
+            return await GetNamespaceDevices().GetAsync(deviceName, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -214,7 +214,7 @@ public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> GetDe
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDeviceResource"/></description>
+        /// <description><see cref="NamespaceDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -223,16 +223,16 @@ public virtual async Task<Response<DeviceRegistryNamespaceDeviceResource>> GetDe
         /// <exception cref="ArgumentNullException"> <paramref name="deviceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="deviceName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual Response<DeviceRegistryNamespaceDeviceResource> GetDeviceRegistryNamespaceDevice(string deviceName, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDeviceResource> GetNamespaceDevice(string deviceName, CancellationToken cancellationToken = default)
         {
-            return GetDeviceRegistryNamespaceDevices().Get(deviceName, cancellationToken);
+            return GetNamespaceDevices().Get(deviceName, cancellationToken);
         }
 
-        /// <summary> Gets a collection of DeviceRegistryNamespaceDiscoveredAssetResources in the DeviceRegistryNamespace. </summary>
-        /// <returns> An object representing collection of DeviceRegistryNamespaceDiscoveredAssetResources and their operations over a DeviceRegistryNamespaceDiscoveredAssetResource. </returns>
-        public virtual DeviceRegistryNamespaceDiscoveredAssetCollection GetDeviceRegistryNamespaceDiscoveredAssets()
+        /// <summary> Gets a collection of NamespaceDiscoveredAssetResources in the Namespace. </summary>
+        /// <returns> An object representing collection of NamespaceDiscoveredAssetResources and their operations over a NamespaceDiscoveredAssetResource. </returns>
+        public virtual NamespaceDiscoveredAssetCollection GetNamespaceDiscoveredAssets()
         {
-            return GetCachedClient(client => new DeviceRegistryNamespaceDiscoveredAssetCollection(client, Id));
+            return GetCachedClient(client => new NamespaceDiscoveredAssetCollection(client, Id));
         }
 
         /// <summary>
@@ -252,7 +252,7 @@ public virtual DeviceRegistryNamespaceDiscoveredAssetCollection GetDeviceRegistr
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -261,9 +261,9 @@ public virtual DeviceRegistryNamespaceDiscoveredAssetCollection GetDeviceRegistr
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredAssetName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="discoveredAssetName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResource>> GetDeviceRegistryNamespaceDiscoveredAssetAsync(string discoveredAssetName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDiscoveredAssetResource>> GetNamespaceDiscoveredAssetAsync(string discoveredAssetName, CancellationToken cancellationToken = default)
         {
-            return await GetDeviceRegistryNamespaceDiscoveredAssets().GetAsync(discoveredAssetName, cancellationToken).ConfigureAwait(false);
+            return await GetNamespaceDiscoveredAssets().GetAsync(discoveredAssetName, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -283,7 +283,7 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResourc
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredAssetResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredAssetResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -292,16 +292,16 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredAssetResourc
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredAssetName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="discoveredAssetName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual Response<DeviceRegistryNamespaceDiscoveredAssetResource> GetDeviceRegistryNamespaceDiscoveredAsset(string discoveredAssetName, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDiscoveredAssetResource> GetNamespaceDiscoveredAsset(string discoveredAssetName, CancellationToken cancellationToken = default)
         {
-            return GetDeviceRegistryNamespaceDiscoveredAssets().Get(discoveredAssetName, cancellationToken);
+            return GetNamespaceDiscoveredAssets().Get(discoveredAssetName, cancellationToken);
         }
 
-        /// <summary> Gets a collection of DeviceRegistryNamespaceDiscoveredDeviceResources in the DeviceRegistryNamespace. </summary>
-        /// <returns> An object representing collection of DeviceRegistryNamespaceDiscoveredDeviceResources and their operations over a DeviceRegistryNamespaceDiscoveredDeviceResource. </returns>
-        public virtual DeviceRegistryNamespaceDiscoveredDeviceCollection GetDeviceRegistryNamespaceDiscoveredDevices()
+        /// <summary> Gets a collection of NamespaceDiscoveredDeviceResources in the Namespace. </summary>
+        /// <returns> An object representing collection of NamespaceDiscoveredDeviceResources and their operations over a NamespaceDiscoveredDeviceResource. </returns>
+        public virtual NamespaceDiscoveredDeviceCollection GetNamespaceDiscoveredDevices()
         {
-            return GetCachedClient(client => new DeviceRegistryNamespaceDiscoveredDeviceCollection(client, Id));
+            return GetCachedClient(client => new NamespaceDiscoveredDeviceCollection(client, Id));
         }
 
         /// <summary>
@@ -321,7 +321,7 @@ public virtual DeviceRegistryNamespaceDiscoveredDeviceCollection GetDeviceRegist
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -330,9 +330,9 @@ public virtual DeviceRegistryNamespaceDiscoveredDeviceCollection GetDeviceRegist
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredDeviceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="discoveredDeviceName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResource>> GetDeviceRegistryNamespaceDiscoveredDeviceAsync(string discoveredDeviceName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceDiscoveredDeviceResource>> GetNamespaceDiscoveredDeviceAsync(string discoveredDeviceName, CancellationToken cancellationToken = default)
         {
-            return await GetDeviceRegistryNamespaceDiscoveredDevices().GetAsync(discoveredDeviceName, cancellationToken).ConfigureAwait(false);
+            return await GetNamespaceDiscoveredDevices().GetAsync(discoveredDeviceName, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -352,7 +352,7 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResour
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceDiscoveredDeviceResource"/></description>
+        /// <description><see cref="NamespaceDiscoveredDeviceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -361,9 +361,9 @@ public virtual async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceResour
         /// <exception cref="ArgumentNullException"> <paramref name="discoveredDeviceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="discoveredDeviceName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual Response<DeviceRegistryNamespaceDiscoveredDeviceResource> GetDeviceRegistryNamespaceDiscoveredDevice(string discoveredDeviceName, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceDiscoveredDeviceResource> GetNamespaceDiscoveredDevice(string discoveredDeviceName, CancellationToken cancellationToken = default)
         {
-            return GetDeviceRegistryNamespaceDiscoveredDevices().Get(discoveredDeviceName, cancellationToken);
+            return GetNamespaceDiscoveredDevices().Get(discoveredDeviceName, cancellationToken);
         }
 
         /// <summary>
@@ -383,21 +383,21 @@ public virtual Response<DeviceRegistryNamespaceDiscoveredDeviceResource> GetDevi
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<Response<DeviceRegistryNamespaceResource>> GetAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceResource>> GetAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceResource.Get");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceResource.Get");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceNamespacesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false);
+                var response = await _namespaceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -423,21 +423,21 @@ public virtual async Task<Response<DeviceRegistryNamespaceResource>> GetAsync(Ca
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual Response<DeviceRegistryNamespaceResource> Get(CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceResource> Get(CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceResource.Get");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceResource.Get");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceNamespacesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken);
+                var response = _namespaceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken);
                 if (response.Value == null)
                     throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new DeviceRegistryNamespaceResource(Client, response.Value), response.GetRawResponse());
+                return Response.FromValue(new NamespaceResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
             {
@@ -463,7 +463,7 @@ public virtual Response<DeviceRegistryNamespaceResource> Get(CancellationToken c
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -471,12 +471,12 @@ public virtual Response<DeviceRegistryNamespaceResource> Get(CancellationToken c
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<ArmOperation> DeleteAsync(WaitUntil waitUntil, CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceResource.Delete");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceResource.Delete");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceNamespacesRestClient.DeleteAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation(_deviceRegistryNamespaceNamespacesClientDiagnostics, Pipeline, _deviceRegistryNamespaceNamespacesRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name).Request, response, OperationFinalStateVia.Location);
+                var response = await _namespaceRestClient.DeleteAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation(_namespaceClientDiagnostics, Pipeline, _namespaceRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionResponseAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -505,7 +505,7 @@ public virtual async Task<ArmOperation> DeleteAsync(WaitUntil waitUntil, Cancell
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -513,12 +513,12 @@ public virtual async Task<ArmOperation> DeleteAsync(WaitUntil waitUntil, Cancell
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancellationToken = default)
         {
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceResource.Delete");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceResource.Delete");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceNamespacesRestClient.Delete(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken);
-                var operation = new DeviceRegistryArmOperation(_deviceRegistryNamespaceNamespacesClientDiagnostics, Pipeline, _deviceRegistryNamespaceNamespacesRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name).Request, response, OperationFinalStateVia.Location);
+                var response = _namespaceRestClient.Delete(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken);
+                var operation = new DeviceRegistryArmOperation(_namespaceClientDiagnostics, Pipeline, _namespaceRestClient.CreateDeleteRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletionResponse(cancellationToken);
                 return operation;
@@ -547,7 +547,7 @@ public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancel
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -555,16 +555,16 @@ public virtual ArmOperation Delete(WaitUntil waitUntil, CancellationToken cancel
         /// <param name="patch"> The resource properties to be updated. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="patch"/> is null. </exception>
-        public virtual async Task<ArmOperation<DeviceRegistryNamespaceResource>> UpdateAsync(WaitUntil waitUntil, DeviceRegistryNamespacePatch patch, CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<NamespaceResource>> UpdateAsync(WaitUntil waitUntil, NamespacePatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(patch, nameof(patch));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceResource.Update");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceResource.Update");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceNamespacesRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, patch, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceResource>(new DeviceRegistryNamespaceOperationSource(Client), _deviceRegistryNamespaceNamespacesClientDiagnostics, Pipeline, _deviceRegistryNamespaceNamespacesRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
+                var response = await _namespaceRestClient.UpdateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, patch, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation<NamespaceResource>(new NamespaceOperationSource(Client), _namespaceClientDiagnostics, Pipeline, _namespaceRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -593,7 +593,7 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceResource>> UpdateA
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -601,16 +601,16 @@ public virtual async Task<ArmOperation<DeviceRegistryNamespaceResource>> UpdateA
         /// <param name="patch"> The resource properties to be updated. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="patch"/> is null. </exception>
-        public virtual ArmOperation<DeviceRegistryNamespaceResource> Update(WaitUntil waitUntil, DeviceRegistryNamespacePatch patch, CancellationToken cancellationToken = default)
+        public virtual ArmOperation<NamespaceResource> Update(WaitUntil waitUntil, NamespacePatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(patch, nameof(patch));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceResource.Update");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceResource.Update");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceNamespacesRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, patch, cancellationToken);
-                var operation = new DeviceRegistryArmOperation<DeviceRegistryNamespaceResource>(new DeviceRegistryNamespaceOperationSource(Client), _deviceRegistryNamespaceNamespacesClientDiagnostics, Pipeline, _deviceRegistryNamespaceNamespacesRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
+                var response = _namespaceRestClient.Update(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, patch, cancellationToken);
+                var operation = new DeviceRegistryArmOperation<NamespaceResource>(new NamespaceOperationSource(Client), _namespaceClientDiagnostics, Pipeline, _namespaceRestClient.CreateUpdateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, patch).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletion(cancellationToken);
                 return operation;
@@ -639,7 +639,7 @@ public virtual ArmOperation<DeviceRegistryNamespaceResource> Update(WaitUntil wa
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -651,12 +651,12 @@ public virtual async Task<ArmOperation> MigrateAsync(WaitUntil waitUntil, Namesp
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceResource.Migrate");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceResource.Migrate");
             scope.Start();
             try
             {
-                var response = await _deviceRegistryNamespaceNamespacesRestClient.MigrateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, content, cancellationToken).ConfigureAwait(false);
-                var operation = new DeviceRegistryArmOperation(_deviceRegistryNamespaceNamespacesClientDiagnostics, Pipeline, _deviceRegistryNamespaceNamespacesRestClient.CreateMigrateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, content).Request, response, OperationFinalStateVia.Location);
+                var response = await _namespaceRestClient.MigrateAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, content, cancellationToken).ConfigureAwait(false);
+                var operation = new DeviceRegistryArmOperation(_namespaceClientDiagnostics, Pipeline, _namespaceRestClient.CreateMigrateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, content).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     await operation.WaitForCompletionResponseAsync(cancellationToken).ConfigureAwait(false);
                 return operation;
@@ -685,7 +685,7 @@ public virtual async Task<ArmOperation> MigrateAsync(WaitUntil waitUntil, Namesp
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -697,12 +697,12 @@ public virtual ArmOperation Migrate(WaitUntil waitUntil, NamespaceMigrateContent
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceResource.Migrate");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceResource.Migrate");
             scope.Start();
             try
             {
-                var response = _deviceRegistryNamespaceNamespacesRestClient.Migrate(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, content, cancellationToken);
-                var operation = new DeviceRegistryArmOperation(_deviceRegistryNamespaceNamespacesClientDiagnostics, Pipeline, _deviceRegistryNamespaceNamespacesRestClient.CreateMigrateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, content).Request, response, OperationFinalStateVia.Location);
+                var response = _namespaceRestClient.Migrate(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, content, cancellationToken);
+                var operation = new DeviceRegistryArmOperation(_namespaceClientDiagnostics, Pipeline, _namespaceRestClient.CreateMigrateRequest(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, content).Request, response, OperationFinalStateVia.Location);
                 if (waitUntil == WaitUntil.Completed)
                     operation.WaitForCompletionResponse(cancellationToken);
                 return operation;
@@ -731,7 +731,7 @@ public virtual ArmOperation Migrate(WaitUntil waitUntil, NamespaceMigrateContent
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -739,12 +739,12 @@ public virtual ArmOperation Migrate(WaitUntil waitUntil, NamespaceMigrateContent
         /// <param name="value"> The value for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> or <paramref name="value"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceResource>> AddTagAsync(string key, string value, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceResource>> AddTagAsync(string key, string value, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
             Argument.AssertNotNull(value, nameof(value));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceResource.AddTag");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceResource.AddTag");
             scope.Start();
             try
             {
@@ -753,13 +753,13 @@ public virtual async Task<Response<DeviceRegistryNamespaceResource>> AddTagAsync
                     var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false);
                     originalTags.Value.Data.TagValues[key] = value;
                     await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    var originalResponse = await _deviceRegistryNamespaceNamespacesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false);
-                    return Response.FromValue(new DeviceRegistryNamespaceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = await _namespaceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false);
+                    return Response.FromValue(new NamespaceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = (await GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false)).Value.Data;
-                    var patch = new DeviceRegistryNamespacePatch();
+                    var patch = new NamespacePatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
@@ -793,7 +793,7 @@ public virtual async Task<Response<DeviceRegistryNamespaceResource>> AddTagAsync
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
@@ -801,12 +801,12 @@ public virtual async Task<Response<DeviceRegistryNamespaceResource>> AddTagAsync
         /// <param name="value"> The value for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> or <paramref name="value"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceResource> AddTag(string key, string value, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceResource> AddTag(string key, string value, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
             Argument.AssertNotNull(value, nameof(value));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceResource.AddTag");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceResource.AddTag");
             scope.Start();
             try
             {
@@ -815,13 +815,13 @@ public virtual Response<DeviceRegistryNamespaceResource> AddTag(string key, stri
                     var originalTags = GetTagResource().Get(cancellationToken);
                     originalTags.Value.Data.TagValues[key] = value;
                     GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken);
-                    var originalResponse = _deviceRegistryNamespaceNamespacesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken);
-                    return Response.FromValue(new DeviceRegistryNamespaceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = _namespaceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken);
+                    return Response.FromValue(new NamespaceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = Get(cancellationToken: cancellationToken).Value.Data;
-                    var patch = new DeviceRegistryNamespacePatch();
+                    var patch = new NamespacePatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
@@ -855,18 +855,18 @@ public virtual Response<DeviceRegistryNamespaceResource> AddTag(string key, stri
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="tags"> The set of tags to use as replacement. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="tags"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceResource>> SetTagsAsync(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceResource>> SetTagsAsync(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(tags, nameof(tags));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceResource.SetTags");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceResource.SetTags");
             scope.Start();
             try
             {
@@ -876,13 +876,13 @@ public virtual async Task<Response<DeviceRegistryNamespaceResource>> SetTagsAsyn
                     var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false);
                     originalTags.Value.Data.TagValues.ReplaceWith(tags);
                     await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    var originalResponse = await _deviceRegistryNamespaceNamespacesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false);
-                    return Response.FromValue(new DeviceRegistryNamespaceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = await _namespaceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false);
+                    return Response.FromValue(new NamespaceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = (await GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false)).Value.Data;
-                    var patch = new DeviceRegistryNamespacePatch();
+                    var patch = new NamespacePatch();
                     patch.Tags.ReplaceWith(tags);
                     var result = await UpdateAsync(WaitUntil.Completed, patch, cancellationToken: cancellationToken).ConfigureAwait(false);
                     return Response.FromValue(result.Value, result.GetRawResponse());
@@ -912,18 +912,18 @@ public virtual async Task<Response<DeviceRegistryNamespaceResource>> SetTagsAsyn
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="tags"> The set of tags to use as replacement. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="tags"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceResource> SetTags(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceResource> SetTags(IDictionary<string, string> tags, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(tags, nameof(tags));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceResource.SetTags");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceResource.SetTags");
             scope.Start();
             try
             {
@@ -933,13 +933,13 @@ public virtual Response<DeviceRegistryNamespaceResource> SetTags(IDictionary<str
                     var originalTags = GetTagResource().Get(cancellationToken);
                     originalTags.Value.Data.TagValues.ReplaceWith(tags);
                     GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken);
-                    var originalResponse = _deviceRegistryNamespaceNamespacesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken);
-                    return Response.FromValue(new DeviceRegistryNamespaceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = _namespaceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken);
+                    return Response.FromValue(new NamespaceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = Get(cancellationToken: cancellationToken).Value.Data;
-                    var patch = new DeviceRegistryNamespacePatch();
+                    var patch = new NamespacePatch();
                     patch.Tags.ReplaceWith(tags);
                     var result = Update(WaitUntil.Completed, patch, cancellationToken: cancellationToken);
                     return Response.FromValue(result.Value, result.GetRawResponse());
@@ -969,18 +969,18 @@ public virtual Response<DeviceRegistryNamespaceResource> SetTags(IDictionary<str
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="key"> The key for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> is null. </exception>
-        public virtual async Task<Response<DeviceRegistryNamespaceResource>> RemoveTagAsync(string key, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<NamespaceResource>> RemoveTagAsync(string key, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceResource.RemoveTag");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceResource.RemoveTag");
             scope.Start();
             try
             {
@@ -989,13 +989,13 @@ public virtual async Task<Response<DeviceRegistryNamespaceResource>> RemoveTagAs
                     var originalTags = await GetTagResource().GetAsync(cancellationToken).ConfigureAwait(false);
                     originalTags.Value.Data.TagValues.Remove(key);
                     await GetTagResource().CreateOrUpdateAsync(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken).ConfigureAwait(false);
-                    var originalResponse = await _deviceRegistryNamespaceNamespacesRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false);
-                    return Response.FromValue(new DeviceRegistryNamespaceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = await _namespaceRestClient.GetAsync(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken).ConfigureAwait(false);
+                    return Response.FromValue(new NamespaceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = (await GetAsync(cancellationToken: cancellationToken).ConfigureAwait(false)).Value.Data;
-                    var patch = new DeviceRegistryNamespacePatch();
+                    var patch = new NamespacePatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
@@ -1029,18 +1029,18 @@ public virtual async Task<Response<DeviceRegistryNamespaceResource>> RemoveTagAs
         /// </item>
         /// <item>
         /// <term>Resource</term>
-        /// <description><see cref="DeviceRegistryNamespaceResource"/></description>
+        /// <description><see cref="NamespaceResource"/></description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="key"> The key for the tag. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="key"/> is null. </exception>
-        public virtual Response<DeviceRegistryNamespaceResource> RemoveTag(string key, CancellationToken cancellationToken = default)
+        public virtual Response<NamespaceResource> RemoveTag(string key, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(key, nameof(key));
 
-            using var scope = _deviceRegistryNamespaceNamespacesClientDiagnostics.CreateScope("DeviceRegistryNamespaceResource.RemoveTag");
+            using var scope = _namespaceClientDiagnostics.CreateScope("NamespaceResource.RemoveTag");
             scope.Start();
             try
             {
@@ -1049,13 +1049,13 @@ public virtual Response<DeviceRegistryNamespaceResource> RemoveTag(string key, C
                     var originalTags = GetTagResource().Get(cancellationToken);
                     originalTags.Value.Data.TagValues.Remove(key);
                     GetTagResource().CreateOrUpdate(WaitUntil.Completed, originalTags.Value.Data, cancellationToken: cancellationToken);
-                    var originalResponse = _deviceRegistryNamespaceNamespacesRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken);
-                    return Response.FromValue(new DeviceRegistryNamespaceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
+                    var originalResponse = _namespaceRestClient.Get(Id.SubscriptionId, Id.ResourceGroupName, Id.Name, cancellationToken);
+                    return Response.FromValue(new NamespaceResource(Client, originalResponse.Value), originalResponse.GetRawResponse());
                 }
                 else
                 {
                     var current = Get(cancellationToken: cancellationToken).Value.Data;
-                    var patch = new DeviceRegistryNamespacePatch();
+                    var patch = new NamespacePatch();
                     foreach (var tag in current.Tags)
                     {
                         patch.Tags.Add(tag);
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceAssetsRestOperations.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceAssetsRestOperations.cs
index 327a3762619a..87012492f42f 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceAssetsRestOperations.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceAssetsRestOperations.cs
@@ -82,7 +82,7 @@ internal HttpMessage CreateGetRequest(string subscriptionId, string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="assetName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="assetName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<DeviceRegistryNamespaceAssetData>> GetAsync(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, CancellationToken cancellationToken = default)
+        public async Task<Response<NamespaceAssetData>> GetAsync(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -95,13 +95,13 @@ public async Task<Response<DeviceRegistryNamespaceAssetData>> GetAsync(string su
             {
                 case 200:
                     {
-                        DeviceRegistryNamespaceAssetData value = default;
+                        NamespaceAssetData value = default;
                         using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = DeviceRegistryNamespaceAssetData.DeserializeDeviceRegistryNamespaceAssetData(document.RootElement);
+                        value = NamespaceAssetData.DeserializeNamespaceAssetData(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 case 404:
-                    return Response.FromValue((DeviceRegistryNamespaceAssetData)null, message.Response);
+                    return Response.FromValue((NamespaceAssetData)null, message.Response);
                 default:
                     throw new RequestFailedException(message.Response);
             }
@@ -115,7 +115,7 @@ public async Task<Response<DeviceRegistryNamespaceAssetData>> GetAsync(string su
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="assetName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="assetName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<DeviceRegistryNamespaceAssetData> Get(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, CancellationToken cancellationToken = default)
+        public Response<NamespaceAssetData> Get(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -128,19 +128,19 @@ public Response<DeviceRegistryNamespaceAssetData> Get(string subscriptionId, str
             {
                 case 200:
                     {
-                        DeviceRegistryNamespaceAssetData value = default;
+                        NamespaceAssetData value = default;
                         using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = DeviceRegistryNamespaceAssetData.DeserializeDeviceRegistryNamespaceAssetData(document.RootElement);
+                        value = NamespaceAssetData.DeserializeNamespaceAssetData(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 case 404:
-                    return Response.FromValue((DeviceRegistryNamespaceAssetData)null, message.Response);
+                    return Response.FromValue((NamespaceAssetData)null, message.Response);
                 default:
                     throw new RequestFailedException(message.Response);
             }
         }
 
-        internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, DeviceRegistryNamespaceAssetData data)
+        internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, NamespaceAssetData data)
         {
             var uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
@@ -156,7 +156,7 @@ internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId
             return uri;
         }
 
-        internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, DeviceRegistryNamespaceAssetData data)
+        internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, NamespaceAssetData data)
         {
             var message = _pipeline.CreateMessage();
             var request = message.Request;
@@ -191,7 +191,7 @@ internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="assetName"/> or <paramref name="data"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="assetName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> CreateOrReplaceAsync(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, DeviceRegistryNamespaceAssetData data, CancellationToken cancellationToken = default)
+        public async Task<Response> CreateOrReplaceAsync(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, NamespaceAssetData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -220,7 +220,7 @@ public async Task<Response> CreateOrReplaceAsync(string subscriptionId, string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="assetName"/> or <paramref name="data"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="assetName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response CreateOrReplace(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, DeviceRegistryNamespaceAssetData data, CancellationToken cancellationToken = default)
+        public Response CreateOrReplace(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, NamespaceAssetData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -240,7 +240,7 @@ public Response CreateOrReplace(string subscriptionId, string resourceGroupName,
             }
         }
 
-        internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, DeviceRegistryNamespaceAssetPatch patch)
+        internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, NamespaceAssetPatch patch)
         {
             var uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
@@ -256,7 +256,7 @@ internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string
             return uri;
         }
 
-        internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, DeviceRegistryNamespaceAssetPatch patch)
+        internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, NamespaceAssetPatch patch)
         {
             var message = _pipeline.CreateMessage();
             var request = message.Request;
@@ -291,7 +291,7 @@ internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="assetName"/> or <paramref name="patch"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="assetName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> UpdateAsync(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, DeviceRegistryNamespaceAssetPatch patch, CancellationToken cancellationToken = default)
+        public async Task<Response> UpdateAsync(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, NamespaceAssetPatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -320,7 +320,7 @@ public async Task<Response> UpdateAsync(string subscriptionId, string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="assetName"/> or <paramref name="patch"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="assetName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response Update(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, DeviceRegistryNamespaceAssetPatch patch, CancellationToken cancellationToken = default)
+        public Response Update(string subscriptionId, string resourceGroupName, string namespaceName, string assetName, NamespaceAssetPatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceDevicesRestOperations.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceDevicesRestOperations.cs
index 235a3ff4b4ef..c4f19ac7215b 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceDevicesRestOperations.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceDevicesRestOperations.cs
@@ -82,7 +82,7 @@ internal HttpMessage CreateGetRequest(string subscriptionId, string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="deviceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="deviceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<DeviceRegistryNamespaceDeviceData>> GetAsync(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, CancellationToken cancellationToken = default)
+        public async Task<Response<NamespaceDeviceData>> GetAsync(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -95,13 +95,13 @@ public async Task<Response<DeviceRegistryNamespaceDeviceData>> GetAsync(string s
             {
                 case 200:
                     {
-                        DeviceRegistryNamespaceDeviceData value = default;
+                        NamespaceDeviceData value = default;
                         using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = DeviceRegistryNamespaceDeviceData.DeserializeDeviceRegistryNamespaceDeviceData(document.RootElement);
+                        value = NamespaceDeviceData.DeserializeNamespaceDeviceData(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 case 404:
-                    return Response.FromValue((DeviceRegistryNamespaceDeviceData)null, message.Response);
+                    return Response.FromValue((NamespaceDeviceData)null, message.Response);
                 default:
                     throw new RequestFailedException(message.Response);
             }
@@ -115,7 +115,7 @@ public async Task<Response<DeviceRegistryNamespaceDeviceData>> GetAsync(string s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="deviceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="deviceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<DeviceRegistryNamespaceDeviceData> Get(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, CancellationToken cancellationToken = default)
+        public Response<NamespaceDeviceData> Get(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -128,19 +128,19 @@ public Response<DeviceRegistryNamespaceDeviceData> Get(string subscriptionId, st
             {
                 case 200:
                     {
-                        DeviceRegistryNamespaceDeviceData value = default;
+                        NamespaceDeviceData value = default;
                         using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = DeviceRegistryNamespaceDeviceData.DeserializeDeviceRegistryNamespaceDeviceData(document.RootElement);
+                        value = NamespaceDeviceData.DeserializeNamespaceDeviceData(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 case 404:
-                    return Response.FromValue((DeviceRegistryNamespaceDeviceData)null, message.Response);
+                    return Response.FromValue((NamespaceDeviceData)null, message.Response);
                 default:
                     throw new RequestFailedException(message.Response);
             }
         }
 
-        internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, DeviceRegistryNamespaceDeviceData data)
+        internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, NamespaceDeviceData data)
         {
             var uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
@@ -156,7 +156,7 @@ internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId
             return uri;
         }
 
-        internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, DeviceRegistryNamespaceDeviceData data)
+        internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, NamespaceDeviceData data)
         {
             var message = _pipeline.CreateMessage();
             var request = message.Request;
@@ -191,7 +191,7 @@ internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="deviceName"/> or <paramref name="data"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="deviceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> CreateOrReplaceAsync(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, DeviceRegistryNamespaceDeviceData data, CancellationToken cancellationToken = default)
+        public async Task<Response> CreateOrReplaceAsync(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, NamespaceDeviceData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -220,7 +220,7 @@ public async Task<Response> CreateOrReplaceAsync(string subscriptionId, string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="deviceName"/> or <paramref name="data"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="deviceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response CreateOrReplace(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, DeviceRegistryNamespaceDeviceData data, CancellationToken cancellationToken = default)
+        public Response CreateOrReplace(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, NamespaceDeviceData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -240,7 +240,7 @@ public Response CreateOrReplace(string subscriptionId, string resourceGroupName,
             }
         }
 
-        internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, DeviceRegistryNamespaceDevicePatch patch)
+        internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, NamespaceDevicePatch patch)
         {
             var uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
@@ -256,7 +256,7 @@ internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string
             return uri;
         }
 
-        internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, DeviceRegistryNamespaceDevicePatch patch)
+        internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, NamespaceDevicePatch patch)
         {
             var message = _pipeline.CreateMessage();
             var request = message.Request;
@@ -291,7 +291,7 @@ internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="deviceName"/> or <paramref name="patch"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="deviceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> UpdateAsync(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, DeviceRegistryNamespaceDevicePatch patch, CancellationToken cancellationToken = default)
+        public async Task<Response> UpdateAsync(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, NamespaceDevicePatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -320,7 +320,7 @@ public async Task<Response> UpdateAsync(string subscriptionId, string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="deviceName"/> or <paramref name="patch"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="deviceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response Update(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, DeviceRegistryNamespaceDevicePatch patch, CancellationToken cancellationToken = default)
+        public Response Update(string subscriptionId, string resourceGroupName, string namespaceName, string deviceName, NamespaceDevicePatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceDiscoveredAssetsRestOperations.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceDiscoveredAssetsRestOperations.cs
index 752de762522a..6ff546a94205 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceDiscoveredAssetsRestOperations.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceDiscoveredAssetsRestOperations.cs
@@ -82,7 +82,7 @@ internal HttpMessage CreateGetRequest(string subscriptionId, string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredAssetName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredAssetName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<DeviceRegistryNamespaceDiscoveredAssetData>> GetAsync(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, CancellationToken cancellationToken = default)
+        public async Task<Response<NamespaceDiscoveredAssetData>> GetAsync(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -95,13 +95,13 @@ public async Task<Response<DeviceRegistryNamespaceDiscoveredAssetData>> GetAsync
             {
                 case 200:
                     {
-                        DeviceRegistryNamespaceDiscoveredAssetData value = default;
+                        NamespaceDiscoveredAssetData value = default;
                         using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = DeviceRegistryNamespaceDiscoveredAssetData.DeserializeDeviceRegistryNamespaceDiscoveredAssetData(document.RootElement);
+                        value = NamespaceDiscoveredAssetData.DeserializeNamespaceDiscoveredAssetData(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 case 404:
-                    return Response.FromValue((DeviceRegistryNamespaceDiscoveredAssetData)null, message.Response);
+                    return Response.FromValue((NamespaceDiscoveredAssetData)null, message.Response);
                 default:
                     throw new RequestFailedException(message.Response);
             }
@@ -115,7 +115,7 @@ public async Task<Response<DeviceRegistryNamespaceDiscoveredAssetData>> GetAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredAssetName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredAssetName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<DeviceRegistryNamespaceDiscoveredAssetData> Get(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, CancellationToken cancellationToken = default)
+        public Response<NamespaceDiscoveredAssetData> Get(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -128,19 +128,19 @@ public Response<DeviceRegistryNamespaceDiscoveredAssetData> Get(string subscript
             {
                 case 200:
                     {
-                        DeviceRegistryNamespaceDiscoveredAssetData value = default;
+                        NamespaceDiscoveredAssetData value = default;
                         using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = DeviceRegistryNamespaceDiscoveredAssetData.DeserializeDeviceRegistryNamespaceDiscoveredAssetData(document.RootElement);
+                        value = NamespaceDiscoveredAssetData.DeserializeNamespaceDiscoveredAssetData(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 case 404:
-                    return Response.FromValue((DeviceRegistryNamespaceDiscoveredAssetData)null, message.Response);
+                    return Response.FromValue((NamespaceDiscoveredAssetData)null, message.Response);
                 default:
                     throw new RequestFailedException(message.Response);
             }
         }
 
-        internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, DeviceRegistryNamespaceDiscoveredAssetData data)
+        internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, NamespaceDiscoveredAssetData data)
         {
             var uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
@@ -156,7 +156,7 @@ internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId
             return uri;
         }
 
-        internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, DeviceRegistryNamespaceDiscoveredAssetData data)
+        internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, NamespaceDiscoveredAssetData data)
         {
             var message = _pipeline.CreateMessage();
             var request = message.Request;
@@ -191,7 +191,7 @@ internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="discoveredAssetName"/> or <paramref name="data"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredAssetName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> CreateOrReplaceAsync(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, DeviceRegistryNamespaceDiscoveredAssetData data, CancellationToken cancellationToken = default)
+        public async Task<Response> CreateOrReplaceAsync(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, NamespaceDiscoveredAssetData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -220,7 +220,7 @@ public async Task<Response> CreateOrReplaceAsync(string subscriptionId, string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="discoveredAssetName"/> or <paramref name="data"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredAssetName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response CreateOrReplace(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, DeviceRegistryNamespaceDiscoveredAssetData data, CancellationToken cancellationToken = default)
+        public Response CreateOrReplace(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, NamespaceDiscoveredAssetData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -240,7 +240,7 @@ public Response CreateOrReplace(string subscriptionId, string resourceGroupName,
             }
         }
 
-        internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, DeviceRegistryNamespaceDiscoveredAssetPatch patch)
+        internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, NamespaceDiscoveredAssetPatch patch)
         {
             var uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
@@ -256,7 +256,7 @@ internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string
             return uri;
         }
 
-        internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, DeviceRegistryNamespaceDiscoveredAssetPatch patch)
+        internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, NamespaceDiscoveredAssetPatch patch)
         {
             var message = _pipeline.CreateMessage();
             var request = message.Request;
@@ -291,7 +291,7 @@ internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="discoveredAssetName"/> or <paramref name="patch"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredAssetName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> UpdateAsync(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, DeviceRegistryNamespaceDiscoveredAssetPatch patch, CancellationToken cancellationToken = default)
+        public async Task<Response> UpdateAsync(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, NamespaceDiscoveredAssetPatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -320,7 +320,7 @@ public async Task<Response> UpdateAsync(string subscriptionId, string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="discoveredAssetName"/> or <paramref name="patch"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredAssetName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response Update(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, DeviceRegistryNamespaceDiscoveredAssetPatch patch, CancellationToken cancellationToken = default)
+        public Response Update(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredAssetName, NamespaceDiscoveredAssetPatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceDiscoveredDevicesRestOperations.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceDiscoveredDevicesRestOperations.cs
index d463a7cd7878..ae47540e6120 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceDiscoveredDevicesRestOperations.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespaceDiscoveredDevicesRestOperations.cs
@@ -82,7 +82,7 @@ internal HttpMessage CreateGetRequest(string subscriptionId, string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredDeviceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredDeviceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceData>> GetAsync(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, CancellationToken cancellationToken = default)
+        public async Task<Response<NamespaceDiscoveredDeviceData>> GetAsync(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -95,13 +95,13 @@ public async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceData>> GetAsyn
             {
                 case 200:
                     {
-                        DeviceRegistryNamespaceDiscoveredDeviceData value = default;
+                        NamespaceDiscoveredDeviceData value = default;
                         using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = DeviceRegistryNamespaceDiscoveredDeviceData.DeserializeDeviceRegistryNamespaceDiscoveredDeviceData(document.RootElement);
+                        value = NamespaceDiscoveredDeviceData.DeserializeNamespaceDiscoveredDeviceData(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 case 404:
-                    return Response.FromValue((DeviceRegistryNamespaceDiscoveredDeviceData)null, message.Response);
+                    return Response.FromValue((NamespaceDiscoveredDeviceData)null, message.Response);
                 default:
                     throw new RequestFailedException(message.Response);
             }
@@ -115,7 +115,7 @@ public async Task<Response<DeviceRegistryNamespaceDiscoveredDeviceData>> GetAsyn
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredDeviceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredDeviceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<DeviceRegistryNamespaceDiscoveredDeviceData> Get(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, CancellationToken cancellationToken = default)
+        public Response<NamespaceDiscoveredDeviceData> Get(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -128,19 +128,19 @@ public Response<DeviceRegistryNamespaceDiscoveredDeviceData> Get(string subscrip
             {
                 case 200:
                     {
-                        DeviceRegistryNamespaceDiscoveredDeviceData value = default;
+                        NamespaceDiscoveredDeviceData value = default;
                         using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = DeviceRegistryNamespaceDiscoveredDeviceData.DeserializeDeviceRegistryNamespaceDiscoveredDeviceData(document.RootElement);
+                        value = NamespaceDiscoveredDeviceData.DeserializeNamespaceDiscoveredDeviceData(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 case 404:
-                    return Response.FromValue((DeviceRegistryNamespaceDiscoveredDeviceData)null, message.Response);
+                    return Response.FromValue((NamespaceDiscoveredDeviceData)null, message.Response);
                 default:
                     throw new RequestFailedException(message.Response);
             }
         }
 
-        internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, DeviceRegistryNamespaceDiscoveredDeviceData data)
+        internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, NamespaceDiscoveredDeviceData data)
         {
             var uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
@@ -156,7 +156,7 @@ internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId
             return uri;
         }
 
-        internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, DeviceRegistryNamespaceDiscoveredDeviceData data)
+        internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, NamespaceDiscoveredDeviceData data)
         {
             var message = _pipeline.CreateMessage();
             var request = message.Request;
@@ -191,7 +191,7 @@ internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="discoveredDeviceName"/> or <paramref name="data"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredDeviceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> CreateOrReplaceAsync(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, DeviceRegistryNamespaceDiscoveredDeviceData data, CancellationToken cancellationToken = default)
+        public async Task<Response> CreateOrReplaceAsync(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, NamespaceDiscoveredDeviceData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -220,7 +220,7 @@ public async Task<Response> CreateOrReplaceAsync(string subscriptionId, string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="discoveredDeviceName"/> or <paramref name="data"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredDeviceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response CreateOrReplace(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, DeviceRegistryNamespaceDiscoveredDeviceData data, CancellationToken cancellationToken = default)
+        public Response CreateOrReplace(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, NamespaceDiscoveredDeviceData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -240,7 +240,7 @@ public Response CreateOrReplace(string subscriptionId, string resourceGroupName,
             }
         }
 
-        internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, DeviceRegistryNamespaceDiscoveredDevicePatch patch)
+        internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, NamespaceDiscoveredDevicePatch patch)
         {
             var uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
@@ -256,7 +256,7 @@ internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string
             return uri;
         }
 
-        internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, DeviceRegistryNamespaceDiscoveredDevicePatch patch)
+        internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, NamespaceDiscoveredDevicePatch patch)
         {
             var message = _pipeline.CreateMessage();
             var request = message.Request;
@@ -291,7 +291,7 @@ internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="discoveredDeviceName"/> or <paramref name="patch"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredDeviceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> UpdateAsync(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, DeviceRegistryNamespaceDiscoveredDevicePatch patch, CancellationToken cancellationToken = default)
+        public async Task<Response> UpdateAsync(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, NamespaceDiscoveredDevicePatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -320,7 +320,7 @@ public async Task<Response> UpdateAsync(string subscriptionId, string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/>, <paramref name="discoveredDeviceName"/> or <paramref name="patch"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="discoveredDeviceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response Update(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, DeviceRegistryNamespaceDiscoveredDevicePatch patch, CancellationToken cancellationToken = default)
+        public Response Update(string subscriptionId, string resourceGroupName, string namespaceName, string discoveredDeviceName, NamespaceDiscoveredDevicePatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespacesRestOperations.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespacesRestOperations.cs
index 540f852ce3ff..b6531bd55085 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespacesRestOperations.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/src/Generated/RestOperations/NamespacesRestOperations.cs
@@ -77,7 +77,7 @@ internal HttpMessage CreateGetRequest(string subscriptionId, string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="namespaceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<DeviceRegistryNamespaceData>> GetAsync(string subscriptionId, string resourceGroupName, string namespaceName, CancellationToken cancellationToken = default)
+        public async Task<Response<NamespaceData>> GetAsync(string subscriptionId, string resourceGroupName, string namespaceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -89,13 +89,13 @@ public async Task<Response<DeviceRegistryNamespaceData>> GetAsync(string subscri
             {
                 case 200:
                     {
-                        DeviceRegistryNamespaceData value = default;
+                        NamespaceData value = default;
                         using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = DeviceRegistryNamespaceData.DeserializeDeviceRegistryNamespaceData(document.RootElement);
+                        value = NamespaceData.DeserializeNamespaceData(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 case 404:
-                    return Response.FromValue((DeviceRegistryNamespaceData)null, message.Response);
+                    return Response.FromValue((NamespaceData)null, message.Response);
                 default:
                     throw new RequestFailedException(message.Response);
             }
@@ -108,7 +108,7 @@ public async Task<Response<DeviceRegistryNamespaceData>> GetAsync(string subscri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="namespaceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<DeviceRegistryNamespaceData> Get(string subscriptionId, string resourceGroupName, string namespaceName, CancellationToken cancellationToken = default)
+        public Response<NamespaceData> Get(string subscriptionId, string resourceGroupName, string namespaceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -120,19 +120,19 @@ public Response<DeviceRegistryNamespaceData> Get(string subscriptionId, string r
             {
                 case 200:
                     {
-                        DeviceRegistryNamespaceData value = default;
+                        NamespaceData value = default;
                         using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = DeviceRegistryNamespaceData.DeserializeDeviceRegistryNamespaceData(document.RootElement);
+                        value = NamespaceData.DeserializeNamespaceData(document.RootElement);
                         return Response.FromValue(value, message.Response);
                     }
                 case 404:
-                    return Response.FromValue((DeviceRegistryNamespaceData)null, message.Response);
+                    return Response.FromValue((NamespaceData)null, message.Response);
                 default:
                     throw new RequestFailedException(message.Response);
             }
         }
 
-        internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, DeviceRegistryNamespaceData data)
+        internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, NamespaceData data)
         {
             var uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
@@ -146,7 +146,7 @@ internal RequestUriBuilder CreateCreateOrReplaceRequestUri(string subscriptionId
             return uri;
         }
 
-        internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string resourceGroupName, string namespaceName, DeviceRegistryNamespaceData data)
+        internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string resourceGroupName, string namespaceName, NamespaceData data)
         {
             var message = _pipeline.CreateMessage();
             var request = message.Request;
@@ -178,7 +178,7 @@ internal HttpMessage CreateCreateOrReplaceRequest(string subscriptionId, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="data"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> CreateOrReplaceAsync(string subscriptionId, string resourceGroupName, string namespaceName, DeviceRegistryNamespaceData data, CancellationToken cancellationToken = default)
+        public async Task<Response> CreateOrReplaceAsync(string subscriptionId, string resourceGroupName, string namespaceName, NamespaceData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -205,7 +205,7 @@ public async Task<Response> CreateOrReplaceAsync(string subscriptionId, string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="data"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response CreateOrReplace(string subscriptionId, string resourceGroupName, string namespaceName, DeviceRegistryNamespaceData data, CancellationToken cancellationToken = default)
+        public Response CreateOrReplace(string subscriptionId, string resourceGroupName, string namespaceName, NamespaceData data, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -224,7 +224,7 @@ public Response CreateOrReplace(string subscriptionId, string resourceGroupName,
             }
         }
 
-        internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, DeviceRegistryNamespacePatch patch)
+        internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string resourceGroupName, string namespaceName, NamespacePatch patch)
         {
             var uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
@@ -238,7 +238,7 @@ internal RequestUriBuilder CreateUpdateRequestUri(string subscriptionId, string
             return uri;
         }
 
-        internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceGroupName, string namespaceName, DeviceRegistryNamespacePatch patch)
+        internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceGroupName, string namespaceName, NamespacePatch patch)
         {
             var message = _pipeline.CreateMessage();
             var request = message.Request;
@@ -270,7 +270,7 @@ internal HttpMessage CreateUpdateRequest(string subscriptionId, string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="patch"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> UpdateAsync(string subscriptionId, string resourceGroupName, string namespaceName, DeviceRegistryNamespacePatch patch, CancellationToken cancellationToken = default)
+        public async Task<Response> UpdateAsync(string subscriptionId, string resourceGroupName, string namespaceName, NamespacePatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
@@ -297,7 +297,7 @@ public async Task<Response> UpdateAsync(string subscriptionId, string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/>, <paramref name="namespaceName"/> or <paramref name="patch"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/>, <paramref name="resourceGroupName"/> or <paramref name="namespaceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response Update(string subscriptionId, string resourceGroupName, string namespaceName, DeviceRegistryNamespacePatch patch, CancellationToken cancellationToken = default)
+        public Response Update(string subscriptionId, string resourceGroupName, string namespaceName, NamespacePatch patch, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
             Argument.AssertNotNullOrEmpty(resourceGroupName, nameof(resourceGroupName));
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceAssetCollection.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceAssetCollection.cs
similarity index 69%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceAssetCollection.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceAssetCollection.cs
index 0e7b6fb173ad..79f6ba49e2a2 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceAssetCollection.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceAssetCollection.cs
@@ -14,7 +14,7 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Samples
 {
-    public partial class Sample_DeviceRegistryNamespaceAssetCollection
+    public partial class Sample_NamespaceAssetCollection
     {
         [Test]
         [Ignore("Only validating compilation of examples")]
@@ -28,22 +28,22 @@ public async Task CreateOrUpdate_CreateOrReplaceNamespaceAsset()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceAssetResource
-            DeviceRegistryNamespaceAssetCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceAssets();
+            // get the collection of this NamespaceAssetResource
+            NamespaceAssetCollection collection = @namespace.GetNamespaceAssets();
 
             // invoke the operation
             string assetName = "my-asset-1";
-            DeviceRegistryNamespaceAssetData data = new DeviceRegistryNamespaceAssetData(new AzureLocation("West Europe"), new DeviceRegistryExtendedLocation("CustomLocation", "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.extendedlocation/customlocations/location1"))
+            NamespaceAssetData data = new NamespaceAssetData(new AzureLocation("West Europe"), new DeviceRegistryExtendedLocation("CustomLocation", "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.extendedlocation/customlocations/location1"))
             {
-                Properties = new DeviceRegistryNamespaceAssetProperties(new DeviceRef("device1", "opcuaendpointname"))
+                Properties = new NamespaceAssetProperties(new DeviceRef("device1", "opcuaendpointname"))
                 {
                     Enabled = true,
                     ExternalAssetId = "8ZBA6LRHU0A458969",
@@ -156,12 +156,12 @@ public async Task CreateOrUpdate_CreateOrReplaceNamespaceAsset()
 ["site"] = "building-1"
 },
             };
-            ArmOperation<DeviceRegistryNamespaceAssetResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, assetName, data);
-            DeviceRegistryNamespaceAssetResource result = lro.Value;
+            ArmOperation<NamespaceAssetResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, assetName, data);
+            NamespaceAssetResource result = lro.Value;
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceAssetData resourceData = result.Data;
+            NamespaceAssetData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -178,24 +178,24 @@ public async Task Get_GetNamespaceAsset()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceAssetResource
-            DeviceRegistryNamespaceAssetCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceAssets();
+            // get the collection of this NamespaceAssetResource
+            NamespaceAssetCollection collection = @namespace.GetNamespaceAssets();
 
             // invoke the operation
             string assetName = "my-asset-1";
-            DeviceRegistryNamespaceAssetResource result = await collection.GetAsync(assetName);
+            NamespaceAssetResource result = await collection.GetAsync(assetName);
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceAssetData resourceData = result.Data;
+            NamespaceAssetData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -212,23 +212,23 @@ public async Task GetAll_ListNamespaceAssetsByResourceGroup()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "adr-namespace-gbk0925-n01";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceAssetResource
-            DeviceRegistryNamespaceAssetCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceAssets();
+            // get the collection of this NamespaceAssetResource
+            NamespaceAssetCollection collection = @namespace.GetNamespaceAssets();
 
             // invoke the operation and iterate over the result
-            await foreach (DeviceRegistryNamespaceAssetResource item in collection.GetAllAsync())
+            await foreach (NamespaceAssetResource item in collection.GetAllAsync())
             {
                 // the variable item is a resource, you could call other operations on this instance as well
                 // but just for demo, we get its data from this resource instance
-                DeviceRegistryNamespaceAssetData resourceData = item.Data;
+                NamespaceAssetData resourceData = item.Data;
                 // for demo we just print out the id
                 Console.WriteLine($"Succeeded on id: {resourceData.Id}");
             }
@@ -248,16 +248,16 @@ public async Task Exists_GetNamespaceAsset()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceAssetResource
-            DeviceRegistryNamespaceAssetCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceAssets();
+            // get the collection of this NamespaceAssetResource
+            NamespaceAssetCollection collection = @namespace.GetNamespaceAssets();
 
             // invoke the operation
             string assetName = "my-asset-1";
@@ -278,21 +278,21 @@ public async Task GetIfExists_GetNamespaceAsset()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceAssetResource
-            DeviceRegistryNamespaceAssetCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceAssets();
+            // get the collection of this NamespaceAssetResource
+            NamespaceAssetCollection collection = @namespace.GetNamespaceAssets();
 
             // invoke the operation
             string assetName = "my-asset-1";
-            NullableResponse<DeviceRegistryNamespaceAssetResource> response = await collection.GetIfExistsAsync(assetName);
-            DeviceRegistryNamespaceAssetResource result = response.HasValue ? response.Value : null;
+            NullableResponse<NamespaceAssetResource> response = await collection.GetIfExistsAsync(assetName);
+            NamespaceAssetResource result = response.HasValue ? response.Value : null;
 
             if (result == null)
             {
@@ -302,7 +302,7 @@ public async Task GetIfExists_GetNamespaceAsset()
             {
                 // the variable result is a resource, you could call other operations on this instance as well
                 // but just for demo, we get its data from this resource instance
-                DeviceRegistryNamespaceAssetData resourceData = result.Data;
+                NamespaceAssetData resourceData = result.Data;
                 // for demo we just print out the id
                 Console.WriteLine($"Succeeded on id: {resourceData.Id}");
             }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceAssetResource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceAssetResource.cs
similarity index 62%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceAssetResource.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceAssetResource.cs
index 57672b2ab740..f7965f4efc36 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceAssetResource.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceAssetResource.cs
@@ -14,7 +14,7 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Samples
 {
-    public partial class Sample_DeviceRegistryNamespaceAssetResource
+    public partial class Sample_NamespaceAssetResource
     {
         [Test]
         [Ignore("Only validating compilation of examples")]
@@ -28,21 +28,21 @@ public async Task Get_GetNamespaceAsset()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceAssetResource created on azure
-            // for more information of creating DeviceRegistryNamespaceAssetResource, please refer to the document of DeviceRegistryNamespaceAssetResource
+            // this example assumes you already have this NamespaceAssetResource created on azure
+            // for more information of creating NamespaceAssetResource, please refer to the document of NamespaceAssetResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
             string assetName = "my-asset-1";
-            ResourceIdentifier deviceRegistryNamespaceAssetResourceId = DeviceRegistryNamespaceAssetResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, assetName);
-            DeviceRegistryNamespaceAssetResource deviceRegistryNamespaceAsset = client.GetDeviceRegistryNamespaceAssetResource(deviceRegistryNamespaceAssetResourceId);
+            ResourceIdentifier namespaceAssetResourceId = NamespaceAssetResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, assetName);
+            NamespaceAssetResource namespaceAsset = client.GetNamespaceAssetResource(namespaceAssetResourceId);
 
             // invoke the operation
-            DeviceRegistryNamespaceAssetResource result = await deviceRegistryNamespaceAsset.GetAsync();
+            NamespaceAssetResource result = await namespaceAsset.GetAsync();
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceAssetData resourceData = result.Data;
+            NamespaceAssetData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -59,17 +59,17 @@ public async Task Delete_DeleteNamespaceAsset()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceAssetResource created on azure
-            // for more information of creating DeviceRegistryNamespaceAssetResource, please refer to the document of DeviceRegistryNamespaceAssetResource
+            // this example assumes you already have this NamespaceAssetResource created on azure
+            // for more information of creating NamespaceAssetResource, please refer to the document of NamespaceAssetResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "adr-namespace-gbk0925-n01";
             string assetName = "adr-asset-gbk0925-n01";
-            ResourceIdentifier deviceRegistryNamespaceAssetResourceId = DeviceRegistryNamespaceAssetResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, assetName);
-            DeviceRegistryNamespaceAssetResource deviceRegistryNamespaceAsset = client.GetDeviceRegistryNamespaceAssetResource(deviceRegistryNamespaceAssetResourceId);
+            ResourceIdentifier namespaceAssetResourceId = NamespaceAssetResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, assetName);
+            NamespaceAssetResource namespaceAsset = client.GetNamespaceAssetResource(namespaceAssetResourceId);
 
             // invoke the operation
-            await deviceRegistryNamespaceAsset.DeleteAsync(WaitUntil.Completed);
+            await namespaceAsset.DeleteAsync(WaitUntil.Completed);
 
             Console.WriteLine("Succeeded");
         }
@@ -86,17 +86,17 @@ public async Task Update_UpdateNamespaceAssets()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceAssetResource created on azure
-            // for more information of creating DeviceRegistryNamespaceAssetResource, please refer to the document of DeviceRegistryNamespaceAssetResource
+            // this example assumes you already have this NamespaceAssetResource created on azure
+            // for more information of creating NamespaceAssetResource, please refer to the document of NamespaceAssetResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
             string assetName = "my-asset-1";
-            ResourceIdentifier deviceRegistryNamespaceAssetResourceId = DeviceRegistryNamespaceAssetResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, assetName);
-            DeviceRegistryNamespaceAssetResource deviceRegistryNamespaceAsset = client.GetDeviceRegistryNamespaceAssetResource(deviceRegistryNamespaceAssetResourceId);
+            ResourceIdentifier namespaceAssetResourceId = NamespaceAssetResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, assetName);
+            NamespaceAssetResource namespaceAsset = client.GetNamespaceAssetResource(namespaceAssetResourceId);
 
             // invoke the operation
-            DeviceRegistryNamespaceAssetPatch patch = new DeviceRegistryNamespaceAssetPatch
+            NamespaceAssetPatch patch = new NamespaceAssetPatch
             {
                 Properties = new NamespaceAssetUpdateProperties
                 {
@@ -105,12 +105,12 @@ public async Task Update_UpdateNamespaceAssets()
                     Description = "This is a sample updated Asset",
                 },
             };
-            ArmOperation<DeviceRegistryNamespaceAssetResource> lro = await deviceRegistryNamespaceAsset.UpdateAsync(WaitUntil.Completed, patch);
-            DeviceRegistryNamespaceAssetResource result = lro.Value;
+            ArmOperation<NamespaceAssetResource> lro = await namespaceAsset.UpdateAsync(WaitUntil.Completed, patch);
+            NamespaceAssetResource result = lro.Value;
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceAssetData resourceData = result.Data;
+            NamespaceAssetData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceCollection.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceCollection.cs
similarity index 82%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceCollection.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceCollection.cs
index 86a14b24464a..2caf52a3734b 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceCollection.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceCollection.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Samples
 {
-    public partial class Sample_DeviceRegistryNamespaceCollection
+    public partial class Sample_NamespaceCollection
     {
         [Test]
         [Ignore("Only validating compilation of examples")]
@@ -37,14 +37,14 @@ public async Task CreateOrUpdate_CreateOrReplaceNamespaceWithEndpoints()
             ResourceIdentifier resourceGroupResourceId = ResourceGroupResource.CreateResourceIdentifier(subscriptionId, resourceGroupName);
             ResourceGroupResource resourceGroupResource = client.GetResourceGroupResource(resourceGroupResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceResource
-            DeviceRegistryNamespaceCollection collection = resourceGroupResource.GetDeviceRegistryNamespaces();
+            // get the collection of this NamespaceResource
+            NamespaceCollection collection = resourceGroupResource.GetNamespaces();
 
             // invoke the operation
             string namespaceName = "adr-namespace-gbk0925-n01";
-            DeviceRegistryNamespaceData data = new DeviceRegistryNamespaceData(new AzureLocation("North Europe"))
+            NamespaceData data = new NamespaceData(new AzureLocation("North Europe"))
             {
-                Properties = new DeviceRegistryNamespaceProperties
+                Properties = new NamespaceProperties
                 {
                     MessagingEndpoints =
 {
@@ -60,12 +60,12 @@ public async Task CreateOrUpdate_CreateOrReplaceNamespaceWithEndpoints()
                 },
                 Identity = new ManagedServiceIdentity("SystemAssigned"),
             };
-            ArmOperation<DeviceRegistryNamespaceResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, namespaceName, data);
-            DeviceRegistryNamespaceResource result = lro.Value;
+            ArmOperation<NamespaceResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, namespaceName, data);
+            NamespaceResource result = lro.Value;
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceData resourceData = result.Data;
+            NamespaceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -89,16 +89,16 @@ public async Task Get_GetNamespace()
             ResourceIdentifier resourceGroupResourceId = ResourceGroupResource.CreateResourceIdentifier(subscriptionId, resourceGroupName);
             ResourceGroupResource resourceGroupResource = client.GetResourceGroupResource(resourceGroupResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceResource
-            DeviceRegistryNamespaceCollection collection = resourceGroupResource.GetDeviceRegistryNamespaces();
+            // get the collection of this NamespaceResource
+            NamespaceCollection collection = resourceGroupResource.GetNamespaces();
 
             // invoke the operation
             string namespaceName = "adr-namespace-gbk0925-n01";
-            DeviceRegistryNamespaceResource result = await collection.GetAsync(namespaceName);
+            NamespaceResource result = await collection.GetAsync(namespaceName);
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceData resourceData = result.Data;
+            NamespaceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -122,15 +122,15 @@ public async Task GetAll_ListNamespacesByResourceGroup()
             ResourceIdentifier resourceGroupResourceId = ResourceGroupResource.CreateResourceIdentifier(subscriptionId, resourceGroupName);
             ResourceGroupResource resourceGroupResource = client.GetResourceGroupResource(resourceGroupResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceResource
-            DeviceRegistryNamespaceCollection collection = resourceGroupResource.GetDeviceRegistryNamespaces();
+            // get the collection of this NamespaceResource
+            NamespaceCollection collection = resourceGroupResource.GetNamespaces();
 
             // invoke the operation and iterate over the result
-            await foreach (DeviceRegistryNamespaceResource item in collection.GetAllAsync())
+            await foreach (NamespaceResource item in collection.GetAllAsync())
             {
                 // the variable item is a resource, you could call other operations on this instance as well
                 // but just for demo, we get its data from this resource instance
-                DeviceRegistryNamespaceData resourceData = item.Data;
+                NamespaceData resourceData = item.Data;
                 // for demo we just print out the id
                 Console.WriteLine($"Succeeded on id: {resourceData.Id}");
             }
@@ -157,8 +157,8 @@ public async Task Exists_GetNamespace()
             ResourceIdentifier resourceGroupResourceId = ResourceGroupResource.CreateResourceIdentifier(subscriptionId, resourceGroupName);
             ResourceGroupResource resourceGroupResource = client.GetResourceGroupResource(resourceGroupResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceResource
-            DeviceRegistryNamespaceCollection collection = resourceGroupResource.GetDeviceRegistryNamespaces();
+            // get the collection of this NamespaceResource
+            NamespaceCollection collection = resourceGroupResource.GetNamespaces();
 
             // invoke the operation
             string namespaceName = "adr-namespace-gbk0925-n01";
@@ -186,13 +186,13 @@ public async Task GetIfExists_GetNamespace()
             ResourceIdentifier resourceGroupResourceId = ResourceGroupResource.CreateResourceIdentifier(subscriptionId, resourceGroupName);
             ResourceGroupResource resourceGroupResource = client.GetResourceGroupResource(resourceGroupResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceResource
-            DeviceRegistryNamespaceCollection collection = resourceGroupResource.GetDeviceRegistryNamespaces();
+            // get the collection of this NamespaceResource
+            NamespaceCollection collection = resourceGroupResource.GetNamespaces();
 
             // invoke the operation
             string namespaceName = "adr-namespace-gbk0925-n01";
-            NullableResponse<DeviceRegistryNamespaceResource> response = await collection.GetIfExistsAsync(namespaceName);
-            DeviceRegistryNamespaceResource result = response.HasValue ? response.Value : null;
+            NullableResponse<NamespaceResource> response = await collection.GetIfExistsAsync(namespaceName);
+            NamespaceResource result = response.HasValue ? response.Value : null;
 
             if (result == null)
             {
@@ -202,7 +202,7 @@ public async Task GetIfExists_GetNamespace()
             {
                 // the variable result is a resource, you could call other operations on this instance as well
                 // but just for demo, we get its data from this resource instance
-                DeviceRegistryNamespaceData resourceData = result.Data;
+                NamespaceData resourceData = result.Data;
                 // for demo we just print out the id
                 Console.WriteLine($"Succeeded on id: {resourceData.Id}");
             }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDeviceCollection.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDeviceCollection.cs
similarity index 63%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDeviceCollection.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDeviceCollection.cs
index 19299ae9f755..9b28a2038ca5 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDeviceCollection.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDeviceCollection.cs
@@ -15,7 +15,7 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Samples
 {
-    public partial class Sample_DeviceRegistryNamespaceDeviceCollection
+    public partial class Sample_NamespaceDeviceCollection
     {
         [Test]
         [Ignore("Only validating compilation of examples")]
@@ -29,22 +29,22 @@ public async Task CreateOrUpdate_CreateOrReplaceNamespaceDevices()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "adr-namespace-gbk0925-n01";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDeviceResource
-            DeviceRegistryNamespaceDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDevices();
+            // get the collection of this NamespaceDeviceResource
+            NamespaceDeviceCollection collection = @namespace.GetNamespaceDevices();
 
             // invoke the operation
             string deviceName = "dev-namespace-gbk0925-n01";
-            DeviceRegistryNamespaceDeviceData data = new DeviceRegistryNamespaceDeviceData(new AzureLocation("West Europe"))
+            NamespaceDeviceData data = new NamespaceDeviceData(new AzureLocation("West Europe"))
             {
-                Properties = new DeviceRegistryNamespaceDeviceProperties
+                Properties = new NamespaceDeviceProperties
                 {
                     Enabled = true,
                     ExternalDeviceId = "adr-smart-device3-7a848b15-af47-40a7-8c06-a3f43314d44f",
@@ -66,12 +66,12 @@ public async Task CreateOrUpdate_CreateOrReplaceNamespaceDevices()
 },
                 },
             };
-            ArmOperation<DeviceRegistryNamespaceDeviceResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, deviceName, data);
-            DeviceRegistryNamespaceDeviceResource result = lro.Value;
+            ArmOperation<NamespaceDeviceResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, deviceName, data);
+            NamespaceDeviceResource result = lro.Value;
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDeviceData resourceData = result.Data;
+            NamespaceDeviceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -88,22 +88,22 @@ public async Task CreateOrUpdate_CreateEdgeEnabledDeviceWithAnonymousHostAuthent
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "adr-namespace-gbk0925-n01";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDeviceResource
-            DeviceRegistryNamespaceDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDevices();
+            // get the collection of this NamespaceDeviceResource
+            NamespaceDeviceCollection collection = @namespace.GetNamespaceDevices();
 
             // invoke the operation
             string deviceName = "namespace-device-on-edge";
-            DeviceRegistryNamespaceDeviceData data = new DeviceRegistryNamespaceDeviceData(new AzureLocation("West Europe"))
+            NamespaceDeviceData data = new NamespaceDeviceData(new AzureLocation("West Europe"))
             {
-                Properties = new DeviceRegistryNamespaceDeviceProperties
+                Properties = new NamespaceDeviceProperties
                 {
                     Enabled = true,
                     ExternalDeviceId = "unique-edge-device-identifier",
@@ -127,12 +127,12 @@ public async Task CreateOrUpdate_CreateEdgeEnabledDeviceWithAnonymousHostAuthent
                 },
                 ExtendedLocation = new DeviceRegistryExtendedLocation("CustomLocation", "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.extendedlocation/customlocations/location1"),
             };
-            ArmOperation<DeviceRegistryNamespaceDeviceResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, deviceName, data);
-            DeviceRegistryNamespaceDeviceResource result = lro.Value;
+            ArmOperation<NamespaceDeviceResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, deviceName, data);
+            NamespaceDeviceResource result = lro.Value;
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDeviceData resourceData = result.Data;
+            NamespaceDeviceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -149,22 +149,22 @@ public async Task CreateOrUpdate_CreateEdgeEnabledDeviceWithUsernamesPasswordInb
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "adr-namespace-gbk0925-n01";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDeviceResource
-            DeviceRegistryNamespaceDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDevices();
+            // get the collection of this NamespaceDeviceResource
+            NamespaceDeviceCollection collection = @namespace.GetNamespaceDevices();
 
             // invoke the operation
             string deviceName = "namespace-device-on-edge";
-            DeviceRegistryNamespaceDeviceData data = new DeviceRegistryNamespaceDeviceData(new AzureLocation("West Europe"))
+            NamespaceDeviceData data = new NamespaceDeviceData(new AzureLocation("West Europe"))
             {
-                Properties = new DeviceRegistryNamespaceDeviceProperties
+                Properties = new NamespaceDeviceProperties
                 {
                     Enabled = true,
                     ExternalDeviceId = "unique-edge-device-identifier",
@@ -191,12 +191,12 @@ public async Task CreateOrUpdate_CreateEdgeEnabledDeviceWithUsernamesPasswordInb
                 },
                 ExtendedLocation = new DeviceRegistryExtendedLocation("CustomLocation", "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.extendedlocation/customlocations/location1"),
             };
-            ArmOperation<DeviceRegistryNamespaceDeviceResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, deviceName, data);
-            DeviceRegistryNamespaceDeviceResource result = lro.Value;
+            ArmOperation<NamespaceDeviceResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, deviceName, data);
+            NamespaceDeviceResource result = lro.Value;
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDeviceData resourceData = result.Data;
+            NamespaceDeviceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -213,22 +213,22 @@ public async Task CreateOrUpdate_CreateEdgeEnabledDeviceWithX509InboundAuthentic
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "adr-namespace-gbk0925-n01";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDeviceResource
-            DeviceRegistryNamespaceDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDevices();
+            // get the collection of this NamespaceDeviceResource
+            NamespaceDeviceCollection collection = @namespace.GetNamespaceDevices();
 
             // invoke the operation
             string deviceName = "namespace-device-on-edge";
-            DeviceRegistryNamespaceDeviceData data = new DeviceRegistryNamespaceDeviceData(new AzureLocation("West Europe"))
+            NamespaceDeviceData data = new NamespaceDeviceData(new AzureLocation("West Europe"))
             {
-                Properties = new DeviceRegistryNamespaceDeviceProperties
+                Properties = new NamespaceDeviceProperties
                 {
                     Enabled = true,
                     ExternalDeviceId = "unique-edge-device-identifier",
@@ -268,12 +268,12 @@ public async Task CreateOrUpdate_CreateEdgeEnabledDeviceWithX509InboundAuthentic
                 },
                 ExtendedLocation = new DeviceRegistryExtendedLocation("CustomLocation", "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.extendedlocation/customlocations/location1"),
             };
-            ArmOperation<DeviceRegistryNamespaceDeviceResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, deviceName, data);
-            DeviceRegistryNamespaceDeviceResource result = lro.Value;
+            ArmOperation<NamespaceDeviceResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, deviceName, data);
+            NamespaceDeviceResource result = lro.Value;
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDeviceData resourceData = result.Data;
+            NamespaceDeviceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -290,24 +290,24 @@ public async Task Get_GetNamespaceDevice()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDeviceResource
-            DeviceRegistryNamespaceDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDevices();
+            // get the collection of this NamespaceDeviceResource
+            NamespaceDeviceCollection collection = @namespace.GetNamespaceDevices();
 
             // invoke the operation
             string deviceName = "my-device-name";
-            DeviceRegistryNamespaceDeviceResource result = await collection.GetAsync(deviceName);
+            NamespaceDeviceResource result = await collection.GetAsync(deviceName);
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDeviceData resourceData = result.Data;
+            NamespaceDeviceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -324,24 +324,24 @@ public async Task Get_GetNamespaceDeviceWithEndpointErrorStatus()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDeviceResource
-            DeviceRegistryNamespaceDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDevices();
+            // get the collection of this NamespaceDeviceResource
+            NamespaceDeviceCollection collection = @namespace.GetNamespaceDevices();
 
             // invoke the operation
             string deviceName = "my-device-name";
-            DeviceRegistryNamespaceDeviceResource result = await collection.GetAsync(deviceName);
+            NamespaceDeviceResource result = await collection.GetAsync(deviceName);
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDeviceData resourceData = result.Data;
+            NamespaceDeviceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -358,23 +358,23 @@ public async Task GetAll_ListNamespaceDevicesByResourceGroup()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "adr-namespace-gbk0925-n01";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDeviceResource
-            DeviceRegistryNamespaceDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDevices();
+            // get the collection of this NamespaceDeviceResource
+            NamespaceDeviceCollection collection = @namespace.GetNamespaceDevices();
 
             // invoke the operation and iterate over the result
-            await foreach (DeviceRegistryNamespaceDeviceResource item in collection.GetAllAsync())
+            await foreach (NamespaceDeviceResource item in collection.GetAllAsync())
             {
                 // the variable item is a resource, you could call other operations on this instance as well
                 // but just for demo, we get its data from this resource instance
-                DeviceRegistryNamespaceDeviceData resourceData = item.Data;
+                NamespaceDeviceData resourceData = item.Data;
                 // for demo we just print out the id
                 Console.WriteLine($"Succeeded on id: {resourceData.Id}");
             }
@@ -394,16 +394,16 @@ public async Task Exists_GetNamespaceDevice()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDeviceResource
-            DeviceRegistryNamespaceDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDevices();
+            // get the collection of this NamespaceDeviceResource
+            NamespaceDeviceCollection collection = @namespace.GetNamespaceDevices();
 
             // invoke the operation
             string deviceName = "my-device-name";
@@ -424,16 +424,16 @@ public async Task Exists_GetNamespaceDeviceWithEndpointErrorStatus()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDeviceResource
-            DeviceRegistryNamespaceDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDevices();
+            // get the collection of this NamespaceDeviceResource
+            NamespaceDeviceCollection collection = @namespace.GetNamespaceDevices();
 
             // invoke the operation
             string deviceName = "my-device-name";
@@ -454,21 +454,21 @@ public async Task GetIfExists_GetNamespaceDevice()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDeviceResource
-            DeviceRegistryNamespaceDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDevices();
+            // get the collection of this NamespaceDeviceResource
+            NamespaceDeviceCollection collection = @namespace.GetNamespaceDevices();
 
             // invoke the operation
             string deviceName = "my-device-name";
-            NullableResponse<DeviceRegistryNamespaceDeviceResource> response = await collection.GetIfExistsAsync(deviceName);
-            DeviceRegistryNamespaceDeviceResource result = response.HasValue ? response.Value : null;
+            NullableResponse<NamespaceDeviceResource> response = await collection.GetIfExistsAsync(deviceName);
+            NamespaceDeviceResource result = response.HasValue ? response.Value : null;
 
             if (result == null)
             {
@@ -478,7 +478,7 @@ public async Task GetIfExists_GetNamespaceDevice()
             {
                 // the variable result is a resource, you could call other operations on this instance as well
                 // but just for demo, we get its data from this resource instance
-                DeviceRegistryNamespaceDeviceData resourceData = result.Data;
+                NamespaceDeviceData resourceData = result.Data;
                 // for demo we just print out the id
                 Console.WriteLine($"Succeeded on id: {resourceData.Id}");
             }
@@ -496,21 +496,21 @@ public async Task GetIfExists_GetNamespaceDeviceWithEndpointErrorStatus()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDeviceResource
-            DeviceRegistryNamespaceDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDevices();
+            // get the collection of this NamespaceDeviceResource
+            NamespaceDeviceCollection collection = @namespace.GetNamespaceDevices();
 
             // invoke the operation
             string deviceName = "my-device-name";
-            NullableResponse<DeviceRegistryNamespaceDeviceResource> response = await collection.GetIfExistsAsync(deviceName);
-            DeviceRegistryNamespaceDeviceResource result = response.HasValue ? response.Value : null;
+            NullableResponse<NamespaceDeviceResource> response = await collection.GetIfExistsAsync(deviceName);
+            NamespaceDeviceResource result = response.HasValue ? response.Value : null;
 
             if (result == null)
             {
@@ -520,7 +520,7 @@ public async Task GetIfExists_GetNamespaceDeviceWithEndpointErrorStatus()
             {
                 // the variable result is a resource, you could call other operations on this instance as well
                 // but just for demo, we get its data from this resource instance
-                DeviceRegistryNamespaceDeviceData resourceData = result.Data;
+                NamespaceDeviceData resourceData = result.Data;
                 // for demo we just print out the id
                 Console.WriteLine($"Succeeded on id: {resourceData.Id}");
             }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDeviceResource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDeviceResource.cs
similarity index 65%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDeviceResource.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDeviceResource.cs
index b60702a65902..a182f3c32cfc 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDeviceResource.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDeviceResource.cs
@@ -15,7 +15,7 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Samples
 {
-    public partial class Sample_DeviceRegistryNamespaceDeviceResource
+    public partial class Sample_NamespaceDeviceResource
     {
         [Test]
         [Ignore("Only validating compilation of examples")]
@@ -29,21 +29,21 @@ public async Task Get_GetNamespaceDevice()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceDeviceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceDeviceResource, please refer to the document of DeviceRegistryNamespaceDeviceResource
+            // this example assumes you already have this NamespaceDeviceResource created on azure
+            // for more information of creating NamespaceDeviceResource, please refer to the document of NamespaceDeviceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
             string deviceName = "my-device-name";
-            ResourceIdentifier deviceRegistryNamespaceDeviceResourceId = DeviceRegistryNamespaceDeviceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, deviceName);
-            DeviceRegistryNamespaceDeviceResource deviceRegistryNamespaceDevice = client.GetDeviceRegistryNamespaceDeviceResource(deviceRegistryNamespaceDeviceResourceId);
+            ResourceIdentifier namespaceDeviceResourceId = NamespaceDeviceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, deviceName);
+            NamespaceDeviceResource namespaceDevice = client.GetNamespaceDeviceResource(namespaceDeviceResourceId);
 
             // invoke the operation
-            DeviceRegistryNamespaceDeviceResource result = await deviceRegistryNamespaceDevice.GetAsync();
+            NamespaceDeviceResource result = await namespaceDevice.GetAsync();
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDeviceData resourceData = result.Data;
+            NamespaceDeviceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -60,21 +60,21 @@ public async Task Get_GetNamespaceDeviceWithEndpointErrorStatus()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceDeviceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceDeviceResource, please refer to the document of DeviceRegistryNamespaceDeviceResource
+            // this example assumes you already have this NamespaceDeviceResource created on azure
+            // for more information of creating NamespaceDeviceResource, please refer to the document of NamespaceDeviceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
             string deviceName = "my-device-name";
-            ResourceIdentifier deviceRegistryNamespaceDeviceResourceId = DeviceRegistryNamespaceDeviceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, deviceName);
-            DeviceRegistryNamespaceDeviceResource deviceRegistryNamespaceDevice = client.GetDeviceRegistryNamespaceDeviceResource(deviceRegistryNamespaceDeviceResourceId);
+            ResourceIdentifier namespaceDeviceResourceId = NamespaceDeviceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, deviceName);
+            NamespaceDeviceResource namespaceDevice = client.GetNamespaceDeviceResource(namespaceDeviceResourceId);
 
             // invoke the operation
-            DeviceRegistryNamespaceDeviceResource result = await deviceRegistryNamespaceDevice.GetAsync();
+            NamespaceDeviceResource result = await namespaceDevice.GetAsync();
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDeviceData resourceData = result.Data;
+            NamespaceDeviceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -91,17 +91,17 @@ public async Task Delete_DeleteNamespaceDevice()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceDeviceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceDeviceResource, please refer to the document of DeviceRegistryNamespaceDeviceResource
+            // this example assumes you already have this NamespaceDeviceResource created on azure
+            // for more information of creating NamespaceDeviceResource, please refer to the document of NamespaceDeviceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "adr-namespace-gbk0925-n01";
             string deviceName = "adr-device-gbk0925-n01";
-            ResourceIdentifier deviceRegistryNamespaceDeviceResourceId = DeviceRegistryNamespaceDeviceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, deviceName);
-            DeviceRegistryNamespaceDeviceResource deviceRegistryNamespaceDevice = client.GetDeviceRegistryNamespaceDeviceResource(deviceRegistryNamespaceDeviceResourceId);
+            ResourceIdentifier namespaceDeviceResourceId = NamespaceDeviceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, deviceName);
+            NamespaceDeviceResource namespaceDevice = client.GetNamespaceDeviceResource(namespaceDeviceResourceId);
 
             // invoke the operation
-            await deviceRegistryNamespaceDevice.DeleteAsync(WaitUntil.Completed);
+            await namespaceDevice.DeleteAsync(WaitUntil.Completed);
 
             Console.WriteLine("Succeeded");
         }
@@ -118,17 +118,17 @@ public async Task Update_UpdateNamespaceDevices()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceDeviceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceDeviceResource, please refer to the document of DeviceRegistryNamespaceDeviceResource
+            // this example assumes you already have this NamespaceDeviceResource created on azure
+            // for more information of creating NamespaceDeviceResource, please refer to the document of NamespaceDeviceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "adr-namespace-gbk0925-n01";
             string deviceName = "dev-namespace-gbk0925-n01";
-            ResourceIdentifier deviceRegistryNamespaceDeviceResourceId = DeviceRegistryNamespaceDeviceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, deviceName);
-            DeviceRegistryNamespaceDeviceResource deviceRegistryNamespaceDevice = client.GetDeviceRegistryNamespaceDeviceResource(deviceRegistryNamespaceDeviceResourceId);
+            ResourceIdentifier namespaceDeviceResourceId = NamespaceDeviceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, deviceName);
+            NamespaceDeviceResource namespaceDevice = client.GetNamespaceDeviceResource(namespaceDeviceResourceId);
 
             // invoke the operation
-            DeviceRegistryNamespaceDevicePatch patch = new DeviceRegistryNamespaceDevicePatch
+            NamespaceDevicePatch patch = new NamespaceDevicePatch
             {
                 Properties = new NamespaceDeviceUpdateProperties
                 {
@@ -151,12 +151,12 @@ public async Task Update_UpdateNamespaceDevices()
                     Enabled = true,
                 },
             };
-            ArmOperation<DeviceRegistryNamespaceDeviceResource> lro = await deviceRegistryNamespaceDevice.UpdateAsync(WaitUntil.Completed, patch);
-            DeviceRegistryNamespaceDeviceResource result = lro.Value;
+            ArmOperation<NamespaceDeviceResource> lro = await namespaceDevice.UpdateAsync(WaitUntil.Completed, patch);
+            NamespaceDeviceResource result = lro.Value;
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDeviceData resourceData = result.Data;
+            NamespaceDeviceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDiscoveredAssetCollection.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDiscoveredAssetCollection.cs
similarity index 69%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDiscoveredAssetCollection.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDiscoveredAssetCollection.cs
index 020201f3f30e..e6185c4ecdcf 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDiscoveredAssetCollection.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDiscoveredAssetCollection.cs
@@ -14,7 +14,7 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Samples
 {
-    public partial class Sample_DeviceRegistryNamespaceDiscoveredAssetCollection
+    public partial class Sample_NamespaceDiscoveredAssetCollection
     {
         [Test]
         [Ignore("Only validating compilation of examples")]
@@ -28,22 +28,22 @@ public async Task CreateOrUpdate_CreateOrReplaceNamespaceDiscoveredAsset()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDiscoveredAssetResource
-            DeviceRegistryNamespaceDiscoveredAssetCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDiscoveredAssets();
+            // get the collection of this NamespaceDiscoveredAssetResource
+            NamespaceDiscoveredAssetCollection collection = @namespace.GetNamespaceDiscoveredAssets();
 
             // invoke the operation
             string discoveredAssetName = "my-discoveredasset-1";
-            DeviceRegistryNamespaceDiscoveredAssetData data = new DeviceRegistryNamespaceDiscoveredAssetData(new AzureLocation("West Europe"), new DeviceRegistryExtendedLocation("CustomLocation", "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.extendedlocation/customlocations/location1"))
+            NamespaceDiscoveredAssetData data = new NamespaceDiscoveredAssetData(new AzureLocation("West Europe"), new DeviceRegistryExtendedLocation("CustomLocation", "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.extendedlocation/customlocations/location1"))
             {
-                Properties = new DeviceRegistryNamespaceDiscoveredAssetProperties(new DeviceRef("myDevice", "opcuaendpointname"), "11111111-1111-1111-1111-111111111111", 73766L)
+                Properties = new NamespaceDiscoveredAssetProperties(new DeviceRef("myDevice", "opcuaendpointname"), "11111111-1111-1111-1111-111111111111", 73766L)
                 {
                     AssetTypeRefs = { "myAssetTypeRef1", "myAssetTypeRef2" },
                     Manufacturer = "Contoso",
@@ -161,12 +161,12 @@ public async Task CreateOrUpdate_CreateOrReplaceNamespaceDiscoveredAsset()
 ["site"] = "building-1"
 },
             };
-            ArmOperation<DeviceRegistryNamespaceDiscoveredAssetResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, discoveredAssetName, data);
-            DeviceRegistryNamespaceDiscoveredAssetResource result = lro.Value;
+            ArmOperation<NamespaceDiscoveredAssetResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, discoveredAssetName, data);
+            NamespaceDiscoveredAssetResource result = lro.Value;
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDiscoveredAssetData resourceData = result.Data;
+            NamespaceDiscoveredAssetData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -183,24 +183,24 @@ public async Task Get_GetNamespaceDiscoveredAsset()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDiscoveredAssetResource
-            DeviceRegistryNamespaceDiscoveredAssetCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDiscoveredAssets();
+            // get the collection of this NamespaceDiscoveredAssetResource
+            NamespaceDiscoveredAssetCollection collection = @namespace.GetNamespaceDiscoveredAssets();
 
             // invoke the operation
             string discoveredAssetName = "my-discoveredasset-1";
-            DeviceRegistryNamespaceDiscoveredAssetResource result = await collection.GetAsync(discoveredAssetName);
+            NamespaceDiscoveredAssetResource result = await collection.GetAsync(discoveredAssetName);
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDiscoveredAssetData resourceData = result.Data;
+            NamespaceDiscoveredAssetData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -217,23 +217,23 @@ public async Task GetAll_ListNamespaceDiscoveredAssetsByResourceGroup()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDiscoveredAssetResource
-            DeviceRegistryNamespaceDiscoveredAssetCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDiscoveredAssets();
+            // get the collection of this NamespaceDiscoveredAssetResource
+            NamespaceDiscoveredAssetCollection collection = @namespace.GetNamespaceDiscoveredAssets();
 
             // invoke the operation and iterate over the result
-            await foreach (DeviceRegistryNamespaceDiscoveredAssetResource item in collection.GetAllAsync())
+            await foreach (NamespaceDiscoveredAssetResource item in collection.GetAllAsync())
             {
                 // the variable item is a resource, you could call other operations on this instance as well
                 // but just for demo, we get its data from this resource instance
-                DeviceRegistryNamespaceDiscoveredAssetData resourceData = item.Data;
+                NamespaceDiscoveredAssetData resourceData = item.Data;
                 // for demo we just print out the id
                 Console.WriteLine($"Succeeded on id: {resourceData.Id}");
             }
@@ -253,16 +253,16 @@ public async Task Exists_GetNamespaceDiscoveredAsset()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDiscoveredAssetResource
-            DeviceRegistryNamespaceDiscoveredAssetCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDiscoveredAssets();
+            // get the collection of this NamespaceDiscoveredAssetResource
+            NamespaceDiscoveredAssetCollection collection = @namespace.GetNamespaceDiscoveredAssets();
 
             // invoke the operation
             string discoveredAssetName = "my-discoveredasset-1";
@@ -283,21 +283,21 @@ public async Task GetIfExists_GetNamespaceDiscoveredAsset()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDiscoveredAssetResource
-            DeviceRegistryNamespaceDiscoveredAssetCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDiscoveredAssets();
+            // get the collection of this NamespaceDiscoveredAssetResource
+            NamespaceDiscoveredAssetCollection collection = @namespace.GetNamespaceDiscoveredAssets();
 
             // invoke the operation
             string discoveredAssetName = "my-discoveredasset-1";
-            NullableResponse<DeviceRegistryNamespaceDiscoveredAssetResource> response = await collection.GetIfExistsAsync(discoveredAssetName);
-            DeviceRegistryNamespaceDiscoveredAssetResource result = response.HasValue ? response.Value : null;
+            NullableResponse<NamespaceDiscoveredAssetResource> response = await collection.GetIfExistsAsync(discoveredAssetName);
+            NamespaceDiscoveredAssetResource result = response.HasValue ? response.Value : null;
 
             if (result == null)
             {
@@ -307,7 +307,7 @@ public async Task GetIfExists_GetNamespaceDiscoveredAsset()
             {
                 // the variable result is a resource, you could call other operations on this instance as well
                 // but just for demo, we get its data from this resource instance
-                DeviceRegistryNamespaceDiscoveredAssetData resourceData = result.Data;
+                NamespaceDiscoveredAssetData resourceData = result.Data;
                 // for demo we just print out the id
                 Console.WriteLine($"Succeeded on id: {resourceData.Id}");
             }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDiscoveredAssetResource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDiscoveredAssetResource.cs
similarity index 59%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDiscoveredAssetResource.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDiscoveredAssetResource.cs
index 98ce9ebb3e30..927a28333e18 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDiscoveredAssetResource.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDiscoveredAssetResource.cs
@@ -14,7 +14,7 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Samples
 {
-    public partial class Sample_DeviceRegistryNamespaceDiscoveredAssetResource
+    public partial class Sample_NamespaceDiscoveredAssetResource
     {
         [Test]
         [Ignore("Only validating compilation of examples")]
@@ -28,21 +28,21 @@ public async Task Get_GetNamespaceDiscoveredAsset()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceDiscoveredAssetResource created on azure
-            // for more information of creating DeviceRegistryNamespaceDiscoveredAssetResource, please refer to the document of DeviceRegistryNamespaceDiscoveredAssetResource
+            // this example assumes you already have this NamespaceDiscoveredAssetResource created on azure
+            // for more information of creating NamespaceDiscoveredAssetResource, please refer to the document of NamespaceDiscoveredAssetResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
             string discoveredAssetName = "my-discoveredasset-1";
-            ResourceIdentifier deviceRegistryNamespaceDiscoveredAssetResourceId = DeviceRegistryNamespaceDiscoveredAssetResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, discoveredAssetName);
-            DeviceRegistryNamespaceDiscoveredAssetResource deviceRegistryNamespaceDiscoveredAsset = client.GetDeviceRegistryNamespaceDiscoveredAssetResource(deviceRegistryNamespaceDiscoveredAssetResourceId);
+            ResourceIdentifier namespaceDiscoveredAssetResourceId = NamespaceDiscoveredAssetResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, discoveredAssetName);
+            NamespaceDiscoveredAssetResource namespaceDiscoveredAsset = client.GetNamespaceDiscoveredAssetResource(namespaceDiscoveredAssetResourceId);
 
             // invoke the operation
-            DeviceRegistryNamespaceDiscoveredAssetResource result = await deviceRegistryNamespaceDiscoveredAsset.GetAsync();
+            NamespaceDiscoveredAssetResource result = await namespaceDiscoveredAsset.GetAsync();
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDiscoveredAssetData resourceData = result.Data;
+            NamespaceDiscoveredAssetData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -59,17 +59,17 @@ public async Task Delete_DeleteNamespaceDiscoveredAsset()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceDiscoveredAssetResource created on azure
-            // for more information of creating DeviceRegistryNamespaceDiscoveredAssetResource, please refer to the document of DeviceRegistryNamespaceDiscoveredAssetResource
+            // this example assumes you already have this NamespaceDiscoveredAssetResource created on azure
+            // for more information of creating NamespaceDiscoveredAssetResource, please refer to the document of NamespaceDiscoveredAssetResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
             string discoveredAssetName = "my-discoveredasset-1";
-            ResourceIdentifier deviceRegistryNamespaceDiscoveredAssetResourceId = DeviceRegistryNamespaceDiscoveredAssetResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, discoveredAssetName);
-            DeviceRegistryNamespaceDiscoveredAssetResource deviceRegistryNamespaceDiscoveredAsset = client.GetDeviceRegistryNamespaceDiscoveredAssetResource(deviceRegistryNamespaceDiscoveredAssetResourceId);
+            ResourceIdentifier namespaceDiscoveredAssetResourceId = NamespaceDiscoveredAssetResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, discoveredAssetName);
+            NamespaceDiscoveredAssetResource namespaceDiscoveredAsset = client.GetNamespaceDiscoveredAssetResource(namespaceDiscoveredAssetResourceId);
 
             // invoke the operation
-            await deviceRegistryNamespaceDiscoveredAsset.DeleteAsync(WaitUntil.Completed);
+            await namespaceDiscoveredAsset.DeleteAsync(WaitUntil.Completed);
 
             Console.WriteLine("Succeeded");
         }
@@ -86,29 +86,29 @@ public async Task Update_UpdateNamespaceDiscoveredAsset()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceDiscoveredAssetResource created on azure
-            // for more information of creating DeviceRegistryNamespaceDiscoveredAssetResource, please refer to the document of DeviceRegistryNamespaceDiscoveredAssetResource
+            // this example assumes you already have this NamespaceDiscoveredAssetResource created on azure
+            // for more information of creating NamespaceDiscoveredAssetResource, please refer to the document of NamespaceDiscoveredAssetResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
             string discoveredAssetName = "my-discoveredasset-1";
-            ResourceIdentifier deviceRegistryNamespaceDiscoveredAssetResourceId = DeviceRegistryNamespaceDiscoveredAssetResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, discoveredAssetName);
-            DeviceRegistryNamespaceDiscoveredAssetResource deviceRegistryNamespaceDiscoveredAsset = client.GetDeviceRegistryNamespaceDiscoveredAssetResource(deviceRegistryNamespaceDiscoveredAssetResourceId);
+            ResourceIdentifier namespaceDiscoveredAssetResourceId = NamespaceDiscoveredAssetResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, discoveredAssetName);
+            NamespaceDiscoveredAssetResource namespaceDiscoveredAsset = client.GetNamespaceDiscoveredAssetResource(namespaceDiscoveredAssetResourceId);
 
             // invoke the operation
-            DeviceRegistryNamespaceDiscoveredAssetPatch patch = new DeviceRegistryNamespaceDiscoveredAssetPatch
+            NamespaceDiscoveredAssetPatch patch = new NamespaceDiscoveredAssetPatch
             {
                 Properties = new NamespaceDiscoveredAssetUpdateProperties
                 {
                     DocumentationUri = "https://www.example.com/manual-2",
                 },
             };
-            ArmOperation<DeviceRegistryNamespaceDiscoveredAssetResource> lro = await deviceRegistryNamespaceDiscoveredAsset.UpdateAsync(WaitUntil.Completed, patch);
-            DeviceRegistryNamespaceDiscoveredAssetResource result = lro.Value;
+            ArmOperation<NamespaceDiscoveredAssetResource> lro = await namespaceDiscoveredAsset.UpdateAsync(WaitUntil.Completed, patch);
+            NamespaceDiscoveredAssetResource result = lro.Value;
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDiscoveredAssetData resourceData = result.Data;
+            NamespaceDiscoveredAssetData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDiscoveredDeviceCollection.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDiscoveredDeviceCollection.cs
similarity index 58%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDiscoveredDeviceCollection.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDiscoveredDeviceCollection.cs
index 986b39b2b1b0..4c421783f4b2 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDiscoveredDeviceCollection.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDiscoveredDeviceCollection.cs
@@ -14,7 +14,7 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Samples
 {
-    public partial class Sample_DeviceRegistryNamespaceDiscoveredDeviceCollection
+    public partial class Sample_NamespaceDiscoveredDeviceCollection
     {
         [Test]
         [Ignore("Only validating compilation of examples")]
@@ -28,22 +28,22 @@ public async Task CreateOrUpdate_CreateOrReplaceNamespaceDiscoveredDevice()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDiscoveredDeviceResource
-            DeviceRegistryNamespaceDiscoveredDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDiscoveredDevices();
+            // get the collection of this NamespaceDiscoveredDeviceResource
+            NamespaceDiscoveredDeviceCollection collection = @namespace.GetNamespaceDiscoveredDevices();
 
             // invoke the operation
             string discoveredDeviceName = "my-discovereddevice-1";
-            DeviceRegistryNamespaceDiscoveredDeviceData data = new DeviceRegistryNamespaceDiscoveredDeviceData(new AzureLocation("West Europe"), new DeviceRegistryExtendedLocation("CustomLocation", "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.extendedlocation/customlocations/location1"))
+            NamespaceDiscoveredDeviceData data = new NamespaceDiscoveredDeviceData(new AzureLocation("West Europe"), new DeviceRegistryExtendedLocation("CustomLocation", "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/myResourceGroup/providers/microsoft.extendedlocation/customlocations/location1"))
             {
-                Properties = new DeviceRegistryNamespaceDiscoveredDeviceProperties("discoveryId1", 1L)
+                Properties = new NamespaceDiscoveredDeviceProperties("discoveryId1", 1L)
                 {
                     Endpoints = new DiscoveredMessagingEndpoints
                     {
@@ -61,12 +61,12 @@ public async Task CreateOrUpdate_CreateOrReplaceNamespaceDiscoveredDevice()
 ["site"] = "building-1"
 },
             };
-            ArmOperation<DeviceRegistryNamespaceDiscoveredDeviceResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, discoveredDeviceName, data);
-            DeviceRegistryNamespaceDiscoveredDeviceResource result = lro.Value;
+            ArmOperation<NamespaceDiscoveredDeviceResource> lro = await collection.CreateOrUpdateAsync(WaitUntil.Completed, discoveredDeviceName, data);
+            NamespaceDiscoveredDeviceResource result = lro.Value;
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDiscoveredDeviceData resourceData = result.Data;
+            NamespaceDiscoveredDeviceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -83,24 +83,24 @@ public async Task Get_GetNamespaceDiscoveredDevice()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDiscoveredDeviceResource
-            DeviceRegistryNamespaceDiscoveredDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDiscoveredDevices();
+            // get the collection of this NamespaceDiscoveredDeviceResource
+            NamespaceDiscoveredDeviceCollection collection = @namespace.GetNamespaceDiscoveredDevices();
 
             // invoke the operation
             string discoveredDeviceName = "my-discovereddevice-1";
-            DeviceRegistryNamespaceDiscoveredDeviceResource result = await collection.GetAsync(discoveredDeviceName);
+            NamespaceDiscoveredDeviceResource result = await collection.GetAsync(discoveredDeviceName);
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDiscoveredDeviceData resourceData = result.Data;
+            NamespaceDiscoveredDeviceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -117,23 +117,23 @@ public async Task GetAll_ListNamespaceDiscoveredDevicesByResourceGroup()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDiscoveredDeviceResource
-            DeviceRegistryNamespaceDiscoveredDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDiscoveredDevices();
+            // get the collection of this NamespaceDiscoveredDeviceResource
+            NamespaceDiscoveredDeviceCollection collection = @namespace.GetNamespaceDiscoveredDevices();
 
             // invoke the operation and iterate over the result
-            await foreach (DeviceRegistryNamespaceDiscoveredDeviceResource item in collection.GetAllAsync())
+            await foreach (NamespaceDiscoveredDeviceResource item in collection.GetAllAsync())
             {
                 // the variable item is a resource, you could call other operations on this instance as well
                 // but just for demo, we get its data from this resource instance
-                DeviceRegistryNamespaceDiscoveredDeviceData resourceData = item.Data;
+                NamespaceDiscoveredDeviceData resourceData = item.Data;
                 // for demo we just print out the id
                 Console.WriteLine($"Succeeded on id: {resourceData.Id}");
             }
@@ -153,16 +153,16 @@ public async Task Exists_GetNamespaceDiscoveredDevice()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDiscoveredDeviceResource
-            DeviceRegistryNamespaceDiscoveredDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDiscoveredDevices();
+            // get the collection of this NamespaceDiscoveredDeviceResource
+            NamespaceDiscoveredDeviceCollection collection = @namespace.GetNamespaceDiscoveredDevices();
 
             // invoke the operation
             string discoveredDeviceName = "my-discovereddevice-1";
@@ -183,21 +183,21 @@ public async Task GetIfExists_GetNamespaceDiscoveredDevice()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
-            // get the collection of this DeviceRegistryNamespaceDiscoveredDeviceResource
-            DeviceRegistryNamespaceDiscoveredDeviceCollection collection = deviceRegistryNamespace.GetDeviceRegistryNamespaceDiscoveredDevices();
+            // get the collection of this NamespaceDiscoveredDeviceResource
+            NamespaceDiscoveredDeviceCollection collection = @namespace.GetNamespaceDiscoveredDevices();
 
             // invoke the operation
             string discoveredDeviceName = "my-discovereddevice-1";
-            NullableResponse<DeviceRegistryNamespaceDiscoveredDeviceResource> response = await collection.GetIfExistsAsync(discoveredDeviceName);
-            DeviceRegistryNamespaceDiscoveredDeviceResource result = response.HasValue ? response.Value : null;
+            NullableResponse<NamespaceDiscoveredDeviceResource> response = await collection.GetIfExistsAsync(discoveredDeviceName);
+            NamespaceDiscoveredDeviceResource result = response.HasValue ? response.Value : null;
 
             if (result == null)
             {
@@ -207,7 +207,7 @@ public async Task GetIfExists_GetNamespaceDiscoveredDevice()
             {
                 // the variable result is a resource, you could call other operations on this instance as well
                 // but just for demo, we get its data from this resource instance
-                DeviceRegistryNamespaceDiscoveredDeviceData resourceData = result.Data;
+                NamespaceDiscoveredDeviceData resourceData = result.Data;
                 // for demo we just print out the id
                 Console.WriteLine($"Succeeded on id: {resourceData.Id}");
             }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDiscoveredDeviceResource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDiscoveredDeviceResource.cs
similarity index 60%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDiscoveredDeviceResource.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDiscoveredDeviceResource.cs
index c2e2fe52f7e9..a2e944872df8 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceDiscoveredDeviceResource.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceDiscoveredDeviceResource.cs
@@ -14,7 +14,7 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Samples
 {
-    public partial class Sample_DeviceRegistryNamespaceDiscoveredDeviceResource
+    public partial class Sample_NamespaceDiscoveredDeviceResource
     {
         [Test]
         [Ignore("Only validating compilation of examples")]
@@ -28,21 +28,21 @@ public async Task Get_GetNamespaceDiscoveredDevice()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceDiscoveredDeviceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceDiscoveredDeviceResource, please refer to the document of DeviceRegistryNamespaceDiscoveredDeviceResource
+            // this example assumes you already have this NamespaceDiscoveredDeviceResource created on azure
+            // for more information of creating NamespaceDiscoveredDeviceResource, please refer to the document of NamespaceDiscoveredDeviceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
             string discoveredDeviceName = "my-discovereddevice-1";
-            ResourceIdentifier deviceRegistryNamespaceDiscoveredDeviceResourceId = DeviceRegistryNamespaceDiscoveredDeviceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, discoveredDeviceName);
-            DeviceRegistryNamespaceDiscoveredDeviceResource deviceRegistryNamespaceDiscoveredDevice = client.GetDeviceRegistryNamespaceDiscoveredDeviceResource(deviceRegistryNamespaceDiscoveredDeviceResourceId);
+            ResourceIdentifier namespaceDiscoveredDeviceResourceId = NamespaceDiscoveredDeviceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, discoveredDeviceName);
+            NamespaceDiscoveredDeviceResource namespaceDiscoveredDevice = client.GetNamespaceDiscoveredDeviceResource(namespaceDiscoveredDeviceResourceId);
 
             // invoke the operation
-            DeviceRegistryNamespaceDiscoveredDeviceResource result = await deviceRegistryNamespaceDiscoveredDevice.GetAsync();
+            NamespaceDiscoveredDeviceResource result = await namespaceDiscoveredDevice.GetAsync();
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDiscoveredDeviceData resourceData = result.Data;
+            NamespaceDiscoveredDeviceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -59,17 +59,17 @@ public async Task Delete_DeleteNamespaceDiscoveredDevice()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceDiscoveredDeviceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceDiscoveredDeviceResource, please refer to the document of DeviceRegistryNamespaceDiscoveredDeviceResource
+            // this example assumes you already have this NamespaceDiscoveredDeviceResource created on azure
+            // for more information of creating NamespaceDiscoveredDeviceResource, please refer to the document of NamespaceDiscoveredDeviceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
             string discoveredDeviceName = "my-discovereddevice-1";
-            ResourceIdentifier deviceRegistryNamespaceDiscoveredDeviceResourceId = DeviceRegistryNamespaceDiscoveredDeviceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, discoveredDeviceName);
-            DeviceRegistryNamespaceDiscoveredDeviceResource deviceRegistryNamespaceDiscoveredDevice = client.GetDeviceRegistryNamespaceDiscoveredDeviceResource(deviceRegistryNamespaceDiscoveredDeviceResourceId);
+            ResourceIdentifier namespaceDiscoveredDeviceResourceId = NamespaceDiscoveredDeviceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, discoveredDeviceName);
+            NamespaceDiscoveredDeviceResource namespaceDiscoveredDevice = client.GetNamespaceDiscoveredDeviceResource(namespaceDiscoveredDeviceResourceId);
 
             // invoke the operation
-            await deviceRegistryNamespaceDiscoveredDevice.DeleteAsync(WaitUntil.Completed);
+            await namespaceDiscoveredDevice.DeleteAsync(WaitUntil.Completed);
 
             Console.WriteLine("Succeeded");
         }
@@ -86,17 +86,17 @@ public async Task Update_UpdateNamespaceDiscoveredDevice()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceDiscoveredDeviceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceDiscoveredDeviceResource, please refer to the document of DeviceRegistryNamespaceDiscoveredDeviceResource
+            // this example assumes you already have this NamespaceDiscoveredDeviceResource created on azure
+            // for more information of creating NamespaceDiscoveredDeviceResource, please refer to the document of NamespaceDiscoveredDeviceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
             string discoveredDeviceName = "my-discovereddevice-1";
-            ResourceIdentifier deviceRegistryNamespaceDiscoveredDeviceResourceId = DeviceRegistryNamespaceDiscoveredDeviceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, discoveredDeviceName);
-            DeviceRegistryNamespaceDiscoveredDeviceResource deviceRegistryNamespaceDiscoveredDevice = client.GetDeviceRegistryNamespaceDiscoveredDeviceResource(deviceRegistryNamespaceDiscoveredDeviceResourceId);
+            ResourceIdentifier namespaceDiscoveredDeviceResourceId = NamespaceDiscoveredDeviceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName, discoveredDeviceName);
+            NamespaceDiscoveredDeviceResource namespaceDiscoveredDevice = client.GetNamespaceDiscoveredDeviceResource(namespaceDiscoveredDeviceResourceId);
 
             // invoke the operation
-            DeviceRegistryNamespaceDiscoveredDevicePatch patch = new DeviceRegistryNamespaceDiscoveredDevicePatch
+            NamespaceDiscoveredDevicePatch patch = new NamespaceDiscoveredDevicePatch
             {
                 Properties = new NamespaceDiscoveredDeviceUpdateProperties
                 {
@@ -112,12 +112,12 @@ public async Task Update_UpdateNamespaceDiscoveredDevice()
                     },
                 },
             };
-            ArmOperation<DeviceRegistryNamespaceDiscoveredDeviceResource> lro = await deviceRegistryNamespaceDiscoveredDevice.UpdateAsync(WaitUntil.Completed, patch);
-            DeviceRegistryNamespaceDiscoveredDeviceResource result = lro.Value;
+            ArmOperation<NamespaceDiscoveredDeviceResource> lro = await namespaceDiscoveredDevice.UpdateAsync(WaitUntil.Completed, patch);
+            NamespaceDiscoveredDeviceResource result = lro.Value;
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceDiscoveredDeviceData resourceData = result.Data;
+            NamespaceDiscoveredDeviceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceResource.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceResource.cs
similarity index 65%
rename from sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceResource.cs
rename to sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceResource.cs
index 83287468888c..582543f9490d 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_DeviceRegistryNamespaceResource.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_NamespaceResource.cs
@@ -14,7 +14,7 @@
 
 namespace Azure.ResourceManager.DeviceRegistry.Samples
 {
-    public partial class Sample_DeviceRegistryNamespaceResource
+    public partial class Sample_NamespaceResource
     {
         [Test]
         [Ignore("Only validating compilation of examples")]
@@ -28,20 +28,20 @@ public async Task Get_GetNamespace()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "adr-namespace-gbk0925-n01";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
             // invoke the operation
-            DeviceRegistryNamespaceResource result = await deviceRegistryNamespace.GetAsync();
+            NamespaceResource result = await @namespace.GetAsync();
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceData resourceData = result.Data;
+            NamespaceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -58,16 +58,16 @@ public async Task Delete_DeleteNamespace()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "adr-namespace-gbk0925-n01";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
             // invoke the operation
-            await deviceRegistryNamespace.DeleteAsync(WaitUntil.Completed);
+            await @namespace.DeleteAsync(WaitUntil.Completed);
 
             Console.WriteLine("Succeeded");
         }
@@ -84,16 +84,16 @@ public async Task Update_UpdateNamespaceEndpoints()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "adr-namespace-gbk0925-n01";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
             // invoke the operation
-            DeviceRegistryNamespacePatch patch = new DeviceRegistryNamespacePatch
+            NamespacePatch patch = new NamespacePatch
             {
                 MessagingEndpoints =
 {
@@ -103,12 +103,12 @@ public async Task Update_UpdateNamespaceEndpoints()
 }
 },
             };
-            ArmOperation<DeviceRegistryNamespaceResource> lro = await deviceRegistryNamespace.UpdateAsync(WaitUntil.Completed, patch);
-            DeviceRegistryNamespaceResource result = lro.Value;
+            ArmOperation<NamespaceResource> lro = await @namespace.UpdateAsync(WaitUntil.Completed, patch);
+            NamespaceResource result = lro.Value;
 
             // the variable result is a resource, you could call other operations on this instance as well
             // but just for demo, we get its data from this resource instance
-            DeviceRegistryNamespaceData resourceData = result.Data;
+            NamespaceData resourceData = result.Data;
             // for demo we just print out the id
             Console.WriteLine($"Succeeded on id: {resourceData.Id}");
         }
@@ -125,13 +125,13 @@ public async Task Migrate_NamespaceMigrate()
             // authenticate your client
             ArmClient client = new ArmClient(cred);
 
-            // this example assumes you already have this DeviceRegistryNamespaceResource created on azure
-            // for more information of creating DeviceRegistryNamespaceResource, please refer to the document of DeviceRegistryNamespaceResource
+            // this example assumes you already have this NamespaceResource created on azure
+            // for more information of creating NamespaceResource, please refer to the document of NamespaceResource
             string subscriptionId = "00000000-0000-0000-0000-000000000000";
             string resourceGroupName = "myResourceGroup";
             string namespaceName = "my-namespace-1";
-            ResourceIdentifier deviceRegistryNamespaceResourceId = DeviceRegistryNamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
-            DeviceRegistryNamespaceResource deviceRegistryNamespace = client.GetDeviceRegistryNamespaceResource(deviceRegistryNamespaceResourceId);
+            ResourceIdentifier namespaceResourceId = NamespaceResource.CreateResourceIdentifier(subscriptionId, resourceGroupName, namespaceName);
+            NamespaceResource @namespace = client.GetNamespaceResource(namespaceResourceId);
 
             // invoke the operation
             NamespaceMigrateContent content = new NamespaceMigrateContent
@@ -139,7 +139,7 @@ public async Task Migrate_NamespaceMigrate()
                 Scope = Scope.Resources,
                 ResourceIds = { "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.DeviceRegistry/assets/my-asset-1", "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.DeviceRegistry/assets/my-asset-2", "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.DeviceRegistry/assets/my-asset-3" },
             };
-            await deviceRegistryNamespace.MigrateAsync(WaitUntil.Completed, content);
+            await @namespace.MigrateAsync(WaitUntil.Completed, content);
 
             Console.WriteLine("Succeeded");
         }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_SubscriptionResourceExtensions.cs b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_SubscriptionResourceExtensions.cs
index 8442f7ccc36d..1d10eb3018c2 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_SubscriptionResourceExtensions.cs
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tests/Generated/Samples/Sample_SubscriptionResourceExtensions.cs
@@ -80,7 +80,7 @@ public async Task GetDeviceRegistryAssetEndpointProfiles_ListAssetEndpointProfil
 
         [Test]
         [Ignore("Only validating compilation of examples")]
-        public async Task GetDeviceRegistryNamespaces_ListNamespacesBySubscription()
+        public async Task GetNamespaces_ListNamespacesBySubscription()
         {
             // Generated from example definition: 2025-10-01/List_Namespace_BySubscription.json
             // this example is just showing the usage of "Namespace_ListBySubscription" operation, for the dependent resources, they will have to be created separately.
@@ -97,11 +97,11 @@ public async Task GetDeviceRegistryNamespaces_ListNamespacesBySubscription()
             SubscriptionResource subscriptionResource = client.GetSubscriptionResource(subscriptionResourceId);
 
             // invoke the operation and iterate over the result
-            await foreach (DeviceRegistryNamespaceResource item in subscriptionResource.GetDeviceRegistryNamespacesAsync())
+            await foreach (NamespaceResource item in subscriptionResource.GetNamespacesAsync())
             {
                 // the variable item is a resource, you could call other operations on this instance as well
                 // but just for demo, we get its data from this resource instance
-                DeviceRegistryNamespaceData resourceData = item.Data;
+                NamespaceData resourceData = item.Data;
                 // for demo we just print out the id
                 Console.WriteLine($"Succeeded on id: {resourceData.Id}");
             }
diff --git a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tsp-location.yaml b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tsp-location.yaml
index b0cff0bd043c..43bbd7f58efe 100644
--- a/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tsp-location.yaml
+++ b/sdk/deviceregistry/Azure.ResourceManager.DeviceRegistry/tsp-location.yaml
@@ -1,3 +1,3 @@
 directory: specification\deviceregistry\DeviceRegistry.Management
-commit: 52fc376d009c4d96b89cfc410c11a38358a18f5b
+commit: be34b3dfc14f90d51e071cd3fd7cea8d1fa6f32f
 repo: Azure/azure-rest-api-specs