diff --git a/tools/generator/template/rpName/packageName/README.md.tpl b/tools/generator/template/rpName/packageName/README.md.tpl
index ce208417349f..826c2af6cdda 100644
--- a/tools/generator/template/rpName/packageName/README.md.tpl
+++ b/tools/generator/template/rpName/packageName/README.md.tpl
@@ -35,17 +35,17 @@ For more information on authentication, please see the documentation for `aziden
 
 ## Connecting to Azure {{PackageTitle}}
 
-Once you have a credential, create a connection to the desired ARM endpoint.  The `armcore` module provides facilities for connecting with ARM endpoints including public and sovereign clouds as well as Azure Stack.
+Once you have a credential, create a connection to the desired ARM endpoint. The `github.com/Azure/azure-sdk-for-go/sdk/azcore/arm` package provides facilities for connecting with ARM endpoints including public and sovereign clouds as well as Azure Stack.
 
 ```go
-con := armcore.NewDefaultConnection(cred, nil)
+con := arm.NewDefaultConnection(cred, nil)
 ```
 
-For more information on ARM connections, please see the documentation for `armcore` at [pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/armcore](https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/armcore).
+For more information on ARM connections, please see the documentation for `azcore` at [pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/azcore](https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/azcore).
 
 ## Clients
 
-Azure {{PackageTitle}} modules consist of one or more clients.  A client groups a set of related APIs, providing access to its functionality within the specified subscription.  Create one or more clients to access the APIs you require using your `armcore.Connection`.
+Azure {{PackageTitle}} modules consist of one or more clients.  A client groups a set of related APIs, providing access to its functionality within the specified subscription.  Create one or more clients to access the APIs you require using your `arm.Connection`.
 
 ```go
 client := {{packageName}}.{{NewClientMethod}}(con, "<subscription ID>")
diff --git a/tools/generator/template/rpName/packageName/build.go.tpl b/tools/generator/template/rpName/packageName/build.go.tpl
index 00ec576c2444..52c354565821 100644
--- a/tools/generator/template/rpName/packageName/build.go.tpl
+++ b/tools/generator/template/rpName/packageName/build.go.tpl
@@ -2,6 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 // This file enables 'go generate' to regenerate this specific SDK
-//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -format -tidy -generate {{packageName}}
+//go:generate pwsh.exe ../../../eng/scripts/build.ps1 -skipBuild -cleanGenerated -format -tidy -generate {{packageName}}
 
 package {{packageName}}