diff --git a/specification/cdn/resource-manager/readme.go.md b/specification/cdn/resource-manager/readme.go.md
index 5a7df98a8f32..05f3a5dd80ae 100644
--- a/specification/cdn/resource-manager/readme.go.md
+++ b/specification/cdn/resource-manager/readme.go.md
@@ -15,6 +15,10 @@ module-name: sdk/resourcemanager/cdn/armcdn
 module: github.com/Azure/azure-sdk-for-go/$(module-name)
 output-folder: $(go-sdk-folder)/$(module-name)
 azure-arm: true
+directive:
+- rename-model:
+    from: 'CdnEndpoint'
+    to: 'EndpointModel'
 ```
 
 ### Go multi-api
diff --git a/specification/databox/resource-manager/readme.go.md b/specification/databox/resource-manager/readme.go.md
index 7b9ddb02eb5b..e34b70c914ca 100644
--- a/specification/databox/resource-manager/readme.go.md
+++ b/specification/databox/resource-manager/readme.go.md
@@ -15,6 +15,16 @@ module-name: sdk/resourcemanager/databox/armdatabox
 module: github.com/Azure/azure-sdk-for-go/$(module-name)
 output-folder: $(go-sdk-folder)/$(module-name)
 azure-arm: true
+directive:
+- rename-model:
+    from: 'JobDetails'
+    to: 'JobDetailsModel'
+- rename-model:
+    from: 'JobSecrets'
+    to: 'JobSecretsModel'
+- rename-model:
+    from: 'ScheduleAvailabilityRequest'
+    to: 'ScheduleAvailabilityRequestModel'
 ```
 
 ### Go multi-api
diff --git a/specification/databoxedge/resource-manager/readme.go.md b/specification/databoxedge/resource-manager/readme.go.md
index 457b519d106b..c90662cfcd50 100644
--- a/specification/databoxedge/resource-manager/readme.go.md
+++ b/specification/databoxedge/resource-manager/readme.go.md
@@ -15,6 +15,10 @@ module-name: sdk/resourcemanager/databoxedge/armdataboxedge
 module: github.com/Azure/azure-sdk-for-go/$(module-name)
 output-folder: $(go-sdk-folder)/$(module-name)
 azure-arm: true
+directive:
+- rename-model:
+    from: 'DataBoxEdgeSku'
+    to: 'SkuForDataBoxEdge'
 ```
 
 ### Go multi-api
diff --git a/specification/guestconfiguration/resource-manager/readme.go.md b/specification/guestconfiguration/resource-manager/readme.go.md
index 6139a9f05ee4..11e00f79582b 100644
--- a/specification/guestconfiguration/resource-manager/readme.go.md
+++ b/specification/guestconfiguration/resource-manager/readme.go.md
@@ -15,6 +15,10 @@ module-name: sdk/resourcemanager/guestconfiguration/armguestconfiguration
 module: github.com/Azure/azure-sdk-for-go/$(module-name)
 output-folder: $(go-sdk-folder)/$(module-name)
 azure-arm: true
+directive:
+- rename-model:
+    from: 'AssignmentReport'
+    to: 'AssignmentReportModel'
 ```
 
 ### Go multi-api
diff --git a/specification/labservices/resource-manager/readme.go.md b/specification/labservices/resource-manager/readme.go.md
index 0a8915f820de..92221c164b08 100644
--- a/specification/labservices/resource-manager/readme.go.md
+++ b/specification/labservices/resource-manager/readme.go.md
@@ -15,6 +15,10 @@ module-name: sdk/resourcemanager/labservices/armlabservices
 module: github.com/Azure/azure-sdk-for-go/$(module-name)
 output-folder: $(go-sdk-folder)/$(module-name)
 azure-arm: true
+directive:
+- rename-model:
+    from: 'LabServicesSku'
+    to: 'SkuForLabServices'
 ```
 
 ### Go multi-api
diff --git a/specification/redis/resource-manager/readme.go.md b/specification/redis/resource-manager/readme.go.md
index e231c3bcc678..57efb658be39 100644
--- a/specification/redis/resource-manager/readme.go.md
+++ b/specification/redis/resource-manager/readme.go.md
@@ -15,6 +15,10 @@ module-name: sdk/resourcemanager/redis/armredis
 module: github.com/Azure/azure-sdk-for-go/$(module-name)
 output-folder: $(go-sdk-folder)/$(module-name)
 azure-arm: true
+directive:
+- rename-model:
+   from: 'RedisResource'
+   to: 'ResourceModel'
 ```
 
 ### Go multi-api
diff --git a/specification/security/resource-manager/readme.go.md b/specification/security/resource-manager/readme.go.md
index 5e49df8201b5..b01842d64898 100644
--- a/specification/security/resource-manager/readme.go.md
+++ b/specification/security/resource-manager/readme.go.md
@@ -15,6 +15,11 @@ module-name: sdk/resourcemanager/security/armsecurity
 module: github.com/Azure/azure-sdk-for-go/$(module-name)
 output-folder: $(go-sdk-folder)/$(module-name)
 azure-arm: true
+directive:
+- from: swagger-document
+  where: '$.paths.*[?(@.operationId.startsWith("SecurityConnectors_"))]'
+  transform: >
+    $["operationId"] = $["operationId"].replace("SecurityConnectors_", "ConnectorsForSecurity_");
 ```
 
 ### Common Go settings
diff --git a/specification/signalr/resource-manager/readme.go.md b/specification/signalr/resource-manager/readme.go.md
index 1fd338d5e839..e786334de7c0 100644
--- a/specification/signalr/resource-manager/readme.go.md
+++ b/specification/signalr/resource-manager/readme.go.md
@@ -15,6 +15,10 @@ module-name: sdk/resourcemanager/signalr/armsignalr
 module: github.com/Azure/azure-sdk-for-go/$(module-name)
 output-folder: $(go-sdk-folder)/$(module-name)
 azure-arm: true
+directive:
+- rename-model:
+    from: 'Resource'
+    to: 'ResourceModel'
 ```
 
 ### Go multi-api
diff --git a/specification/videoanalyzer/resource-manager/readme.go.md b/specification/videoanalyzer/resource-manager/readme.go.md
index a75278e2eeaf..ca7ba523a297 100644
--- a/specification/videoanalyzer/resource-manager/readme.go.md
+++ b/specification/videoanalyzer/resource-manager/readme.go.md
@@ -15,6 +15,18 @@ module-name: sdk/resourcemanager/videoanalyzer/armvideoanalyzer
 module: github.com/Azure/azure-sdk-for-go/$(module-name)
 output-folder: $(go-sdk-folder)/$(module-name)
 azure-arm: true
+directive:
+- rename-model:
+    from: 'Properties'
+    to: 'MetricProperties'
+- from: swagger-document
+  where: '$.paths.*[?(@.operationId.startsWith("VideoAnalyzerOperationStatuses_"))]'
+  transform: >
+    $["operationId"] = $["operationId"].replace("VideoAnalyzerOperationStatuses_", "OperationStatusesForVideoAnalyzer_")
+- from: swagger-document
+  where: '$.paths.*[?(@.operationId.startsWith("VideoAnalyzerOperationResults_"))]'
+  transform: >
+    $["operationId"] = $["operationId"].replace("VideoAnalyzerOperationResults_", "OperationResultsForVideoAnalyzer_")
 ```
 
 ### Go multi-api
diff --git a/specification/webpubsub/resource-manager/readme.go.md b/specification/webpubsub/resource-manager/readme.go.md
index 4e0f33150865..f731f58b976d 100644
--- a/specification/webpubsub/resource-manager/readme.go.md
+++ b/specification/webpubsub/resource-manager/readme.go.md
@@ -15,6 +15,10 @@ module-name: sdk/resourcemanager/webpubsub/armwebpubsub
 module: github.com/Azure/azure-sdk-for-go/$(module-name)
 output-folder: $(go-sdk-folder)/$(module-name)
 azure-arm: true
+directive:
+- rename-model:
+    from: 'Resource'
+    to: 'ResourceModel'
 ```
 
 ### Go multi-api