diff --git a/custom-words.txt b/custom-words.txt
index 21d328170955..a81f07c733c5 100644
--- a/custom-words.txt
+++ b/custom-words.txt
@@ -46,6 +46,7 @@ affinitized
 AFRINIC
 agentpool
 aggregatedcost
+Agri
 AHUB
 AIAPI
 Akamai
diff --git a/specification/agfood/resource-manager/Microsoft.AgFoodPlatform/preview/2020-05-12-preview/agfood.json b/specification/agfood/resource-manager/Microsoft.AgFoodPlatform/preview/2020-05-12-preview/agfood.json
index 4c4c7db32213..923b4fcd103b 100644
--- a/specification/agfood/resource-manager/Microsoft.AgFoodPlatform/preview/2020-05-12-preview/agfood.json
+++ b/specification/agfood/resource-manager/Microsoft.AgFoodPlatform/preview/2020-05-12-preview/agfood.json
@@ -1,8 +1,8 @@
 {
   "swagger": "2.0",
   "info": {
-    "title": "Azure AgFoodPlatform RP Service",
-    "description": "APIs documentation for Azure AgFoodPlatform Resource Provider Service.",
+    "title": "Azure AgriFood RP Service",
+    "description": "APIs documentation for Azure AgriFood Resource Provider Service.",
     "version": "2020-05-12-preview"
   },
   "paths": {
diff --git a/specification/agfood/resource-manager/readme.csharp.md b/specification/agfood/resource-manager/readme.csharp.md
index 9e64c3052486..e43f57857a1f 100644
--- a/specification/agfood/resource-manager/readme.csharp.md
+++ b/specification/agfood/resource-manager/readme.csharp.md
@@ -10,6 +10,6 @@ csharp:
   payload-flattening-threshold: 1
   clear-output-folder: true
   client-side-validation: false
-  namespace: Microsoft.AgFoodPlatform
-  output-folder: $(csharp-sdks-folder)/agfood/management/Microsoft.AgFoodPlatform/Generated
+  namespace: Microsoft.Azure.Management.AgriFood
+  output-folder: $(csharp-sdks-folder)/agrifood/Microsoft.Azure.Management.AgriFood/src/Generated
 ```
diff --git a/specification/agfood/resource-manager/readme.go.md b/specification/agfood/resource-manager/readme.go.md
index 056ea4b911ef..7acfd99fba12 100644
--- a/specification/agfood/resource-manager/readme.go.md
+++ b/specification/agfood/resource-manager/readme.go.md
@@ -4,7 +4,7 @@ These settings apply only when `--go` is specified on the command line.
 
 ```yaml $(go) && $(track2)
 license-header: MICROSOFT_MIT_NO_VERSION
-module-name: sdk/agfood/armagfood
+module-name: sdk/agrifood/armagrifood
 module: github.com/Azure/azure-sdk-for-go/$(module-name)
 output-folder: $(go-sdk-folder)/$(module-name)
 azure-arm: true
diff --git a/specification/agfood/resource-manager/readme.md b/specification/agfood/resource-manager/readme.md
index 2798ac8e8a73..0ba226c8c8ee 100644
--- a/specification/agfood/resource-manager/readme.md
+++ b/specification/agfood/resource-manager/readme.md
@@ -22,7 +22,7 @@ For other options on installation see [Installing AutoRest](https://aka.ms/autor
 
 ### Basic Information
 
-These are the global settings for the agfood.
+These are the global settings for the agrifood.
 
 ```yaml
 openapi-type: arm
diff --git a/specification/agfood/resource-manager/readme.python.md b/specification/agfood/resource-manager/readme.python.md
index f109f297029c..8d1ac3775c76 100644
--- a/specification/agfood/resource-manager/readme.python.md
+++ b/specification/agfood/resource-manager/readme.python.md
@@ -3,21 +3,21 @@
 These settings apply only when `--python` is specified on the command line.
 Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
 
-``` yaml $(track2)
+``` yaml $(python) && $(track2)
 azure-arm: true
 license-header: MICROSOFT_MIT_NO_VERSION
-package-name: azure-mgmt-agfood
-no-namespace-folders: true
+namespace: azure.mgmt.agrifood
+package-name: azure-mgmt-agrifood
 package-version: 1.0.0b1
 clear-output-folder: true
 ```
 
-``` yaml $(python-mode) == 'update' && $(track2)
+``` yaml $(python) && $(python-mode) == 'update' && $(track2)
 no-namespace-folders: true
-output-folder: $(python-sdks-folder)/agfood/azure-mgmt-agfood/azure/mgmt/agfood
+output-folder: $(python-sdks-folder)/agrifood/azure-mgmt-agrifood/azure/mgmt/agrifood
 ```
 
-``` yaml $(python-mode) == 'create' && $(track2)
+``` yaml $(python) && $(python-mode) == 'create' && $(track2)
 basic-setup-py: true
-output-folder: $(python-sdks-folder)/agfood/azure-mgmt-agfood
+output-folder: $(python-sdks-folder)/agrifood/azure-mgmt-agrifood
 ```
diff --git a/specification/agfood/resource-manager/readme.typescript.md b/specification/agfood/resource-manager/readme.typescript.md
index c4ad9c4e1545..b6ecbc0290a9 100644
--- a/specification/agfood/resource-manager/readme.typescript.md
+++ b/specification/agfood/resource-manager/readme.typescript.md
@@ -7,8 +7,8 @@ Please also specify `--typescript-sdks-folder=<path to root folder of your azure
 typescript:
   azure-arm: true
   license-header: MICROSOFT_MIT_NO_VERSION
-  package-name: "@azure/arm-agfood"
-  output-folder: "$(typescript-sdks-folder)/sdk/agfood/arm-agfood"
+  package-name: "@azure/arm-agrifood"
+  output-folder: "$(typescript-sdks-folder)/sdk/agrifood/arm-agrifood"
   payload-flattening-threshold: 1
   clear-output-folder: true
   generate-metadata: true