diff --git a/tools/generator/autorest/changelog.go b/tools/generator/autorest/changelog.go
index 21d53ea8624d..96794e24a51b 100644
--- a/tools/generator/autorest/changelog.go
+++ b/tools/generator/autorest/changelog.go
@@ -23,7 +23,7 @@ type ChangelogContext interface {
 
 // ChangelogProcessor processes the metadata and output changelog with the desired format
 type ChangelogProcessor struct {
-	ctx              ChangelogContext
+	ctx ChangelogContext
 }
 
 // NewChangelogProcessorFromContext returns a new ChangelogProcessor
diff --git a/tools/generator/template/rpName/packageName/README.md.tpl b/tools/generator/template/rpName/packageName/README.md.tpl
index 9f5c578c51d8..ce208417349f 100644
--- a/tools/generator/template/rpName/packageName/README.md.tpl
+++ b/tools/generator/template/rpName/packageName/README.md.tpl
@@ -17,7 +17,7 @@ The `{{packageName}}` module provides operations for working with Azure {{Packag
 
 This project uses [Go modules](https://github.com/golang/go/wiki/Modules) for versioning and dependency management.
 
-Install the Azure AgFood module:
+Install the Azure {{PackageTitle}} module:
 
 ```sh
 go get github.com/Azure/azure-sdk-for-go/sdk/{{rpName}}/{{packageName}}