diff --git a/services/containerregistry/mgmt/2019-05-01-preview/containerregistry/models.go b/services/containerregistry/mgmt/2019-05-01-preview/containerregistry/models.go
index a56ebfb7f3c6..f1e48788ddb2 100644
--- a/services/containerregistry/mgmt/2019-05-01-preview/containerregistry/models.go
+++ b/services/containerregistry/mgmt/2019-05-01-preview/containerregistry/models.go
@@ -560,7 +560,7 @@ type GenerateCredentialsParameters struct {
 	TokenID *string `json:"tokenId,omitempty"`
 	// Expiry - The expiry date of the generated credentials after which the credentials become invalid.
 	Expiry *date.Time `json:"expiry,omitempty"`
-	// Name - Specifies name of the password which should be regenerated if any -- password or password2. Possible values include: 'TokenPasswordNamePassword1', 'TokenPasswordNamePassword2'
+	// Name - Specifies name of the password which should be regenerated if any -- password1 or password2. Possible values include: 'TokenPasswordNamePassword1', 'TokenPasswordNamePassword2'
 	Name TokenPasswordName `json:"name,omitempty"`
 }
 
@@ -2119,8 +2119,8 @@ type ScopeMapProperties struct {
 	// ProvisioningState - READ-ONLY; Provisioning state of the resource. Possible values include: 'Creating', 'Updating', 'Deleting', 'Succeeded', 'Failed', 'Canceled'
 	ProvisioningState ProvisioningState `json:"provisioningState,omitempty"`
 	// Actions - The list of scoped permissions for registry artifacts.
-	// E.g. repositories/repository-name/pull,
-	// repositories/repository-name/delete
+	// E.g. repositories/repository-name/content/read,
+	// repositories/repository-name/metadata/write
 	Actions *[]string `json:"actions,omitempty"`
 }
 
@@ -2554,7 +2554,7 @@ type TokenPassword struct {
 	CreationTime *date.Time `json:"creationTime,omitempty"`
 	// Expiry - The expiry datetime of the password.
 	Expiry *date.Time `json:"expiry,omitempty"`
-	// Name - The password name "password" or "password2". Possible values include: 'TokenPasswordNamePassword1', 'TokenPasswordNamePassword2'
+	// Name - The password name "password1" or "password2". Possible values include: 'TokenPasswordNamePassword1', 'TokenPasswordNamePassword2'
 	Name TokenPasswordName `json:"name,omitempty"`
 	// Value - READ-ONLY; The password value.
 	Value *string `json:"value,omitempty"`
diff --git a/services/containerregistry/mgmt/2019-05-01-preview/containerregistry/scopemaps.go b/services/containerregistry/mgmt/2019-05-01-preview/containerregistry/scopemaps.go
index 90bd1a9ff108..0872a95f4632 100644
--- a/services/containerregistry/mgmt/2019-05-01-preview/containerregistry/scopemaps.go
+++ b/services/containerregistry/mgmt/2019-05-01-preview/containerregistry/scopemaps.go
@@ -68,7 +68,7 @@ func (client ScopeMapsClient) Create(ctx context.Context, resourceGroupName stri
 		{TargetValue: scopeMapName,
 			Constraints: []validation.Constraint{{Target: "scopeMapName", Name: validation.MaxLength, Rule: 50, Chain: nil},
 				{Target: "scopeMapName", Name: validation.MinLength, Rule: 5, Chain: nil},
-				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-]*$`, Chain: nil}}},
+				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-_]*$`, Chain: nil}}},
 		{TargetValue: scopeMapCreateParameters,
 			Constraints: []validation.Constraint{{Target: "scopeMapCreateParameters.ScopeMapProperties", Name: validation.Null, Rule: false,
 				Chain: []validation.Constraint{{Target: "scopeMapCreateParameters.ScopeMapProperties.Actions", Name: validation.Null, Rule: true, Chain: nil}}}}}}); err != nil {
@@ -166,7 +166,7 @@ func (client ScopeMapsClient) Delete(ctx context.Context, resourceGroupName stri
 		{TargetValue: scopeMapName,
 			Constraints: []validation.Constraint{{Target: "scopeMapName", Name: validation.MaxLength, Rule: 50, Chain: nil},
 				{Target: "scopeMapName", Name: validation.MinLength, Rule: 5, Chain: nil},
-				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-]*$`, Chain: nil}}}}); err != nil {
+				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-_]*$`, Chain: nil}}}}); err != nil {
 		return result, validation.NewError("containerregistry.ScopeMapsClient", "Delete", err.Error())
 	}
 
@@ -258,7 +258,7 @@ func (client ScopeMapsClient) Get(ctx context.Context, resourceGroupName string,
 		{TargetValue: scopeMapName,
 			Constraints: []validation.Constraint{{Target: "scopeMapName", Name: validation.MaxLength, Rule: 50, Chain: nil},
 				{Target: "scopeMapName", Name: validation.MinLength, Rule: 5, Chain: nil},
-				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-]*$`, Chain: nil}}}}); err != nil {
+				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-_]*$`, Chain: nil}}}}); err != nil {
 		return result, validation.NewError("containerregistry.ScopeMapsClient", "Get", err.Error())
 	}
 
@@ -477,7 +477,7 @@ func (client ScopeMapsClient) Update(ctx context.Context, resourceGroupName stri
 		{TargetValue: scopeMapName,
 			Constraints: []validation.Constraint{{Target: "scopeMapName", Name: validation.MaxLength, Rule: 50, Chain: nil},
 				{Target: "scopeMapName", Name: validation.MinLength, Rule: 5, Chain: nil},
-				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-]*$`, Chain: nil}}}}); err != nil {
+				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-_]*$`, Chain: nil}}}}); err != nil {
 		return result, validation.NewError("containerregistry.ScopeMapsClient", "Update", err.Error())
 	}
 
diff --git a/services/containerregistry/mgmt/2019-06-01-preview/containerregistry/models.go b/services/containerregistry/mgmt/2019-06-01-preview/containerregistry/models.go
index 4a08cf77c1a5..2985cd7f36d1 100644
--- a/services/containerregistry/mgmt/2019-06-01-preview/containerregistry/models.go
+++ b/services/containerregistry/mgmt/2019-06-01-preview/containerregistry/models.go
@@ -1734,7 +1734,7 @@ type GenerateCredentialsParameters struct {
 	TokenID *string `json:"tokenId,omitempty"`
 	// Expiry - The expiry date of the generated credentials after which the credentials become invalid.
 	Expiry *date.Time `json:"expiry,omitempty"`
-	// Name - Specifies name of the password which should be regenerated if any -- password or password2. Possible values include: 'TokenPasswordNamePassword1', 'TokenPasswordNamePassword2'
+	// Name - Specifies name of the password which should be regenerated if any -- password1 or password2. Possible values include: 'TokenPasswordNamePassword1', 'TokenPasswordNamePassword2'
 	Name TokenPasswordName `json:"name,omitempty"`
 }
 
@@ -3854,8 +3854,8 @@ type ScopeMapProperties struct {
 	// ProvisioningState - READ-ONLY; Provisioning state of the resource. Possible values include: 'Creating', 'Updating', 'Deleting', 'Succeeded', 'Failed', 'Canceled'
 	ProvisioningState ProvisioningState `json:"provisioningState,omitempty"`
 	// Actions - The list of scoped permissions for registry artifacts.
-	// E.g. repositories/repository-name/pull,
-	// repositories/repository-name/delete
+	// E.g. repositories/repository-name/content/read,
+	// repositories/repository-name/metadata/write
 	Actions *[]string `json:"actions,omitempty"`
 }
 
@@ -5313,7 +5313,7 @@ type TokenPassword struct {
 	CreationTime *date.Time `json:"creationTime,omitempty"`
 	// Expiry - The expiry datetime of the password.
 	Expiry *date.Time `json:"expiry,omitempty"`
-	// Name - The password name "password" or "password2". Possible values include: 'TokenPasswordNamePassword1', 'TokenPasswordNamePassword2'
+	// Name - The password name "password1" or "password2". Possible values include: 'TokenPasswordNamePassword1', 'TokenPasswordNamePassword2'
 	Name TokenPasswordName `json:"name,omitempty"`
 	// Value - READ-ONLY; The password value.
 	Value *string `json:"value,omitempty"`
diff --git a/services/containerregistry/mgmt/2019-06-01-preview/containerregistry/scopemaps.go b/services/containerregistry/mgmt/2019-06-01-preview/containerregistry/scopemaps.go
index 90bd1a9ff108..0872a95f4632 100644
--- a/services/containerregistry/mgmt/2019-06-01-preview/containerregistry/scopemaps.go
+++ b/services/containerregistry/mgmt/2019-06-01-preview/containerregistry/scopemaps.go
@@ -68,7 +68,7 @@ func (client ScopeMapsClient) Create(ctx context.Context, resourceGroupName stri
 		{TargetValue: scopeMapName,
 			Constraints: []validation.Constraint{{Target: "scopeMapName", Name: validation.MaxLength, Rule: 50, Chain: nil},
 				{Target: "scopeMapName", Name: validation.MinLength, Rule: 5, Chain: nil},
-				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-]*$`, Chain: nil}}},
+				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-_]*$`, Chain: nil}}},
 		{TargetValue: scopeMapCreateParameters,
 			Constraints: []validation.Constraint{{Target: "scopeMapCreateParameters.ScopeMapProperties", Name: validation.Null, Rule: false,
 				Chain: []validation.Constraint{{Target: "scopeMapCreateParameters.ScopeMapProperties.Actions", Name: validation.Null, Rule: true, Chain: nil}}}}}}); err != nil {
@@ -166,7 +166,7 @@ func (client ScopeMapsClient) Delete(ctx context.Context, resourceGroupName stri
 		{TargetValue: scopeMapName,
 			Constraints: []validation.Constraint{{Target: "scopeMapName", Name: validation.MaxLength, Rule: 50, Chain: nil},
 				{Target: "scopeMapName", Name: validation.MinLength, Rule: 5, Chain: nil},
-				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-]*$`, Chain: nil}}}}); err != nil {
+				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-_]*$`, Chain: nil}}}}); err != nil {
 		return result, validation.NewError("containerregistry.ScopeMapsClient", "Delete", err.Error())
 	}
 
@@ -258,7 +258,7 @@ func (client ScopeMapsClient) Get(ctx context.Context, resourceGroupName string,
 		{TargetValue: scopeMapName,
 			Constraints: []validation.Constraint{{Target: "scopeMapName", Name: validation.MaxLength, Rule: 50, Chain: nil},
 				{Target: "scopeMapName", Name: validation.MinLength, Rule: 5, Chain: nil},
-				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-]*$`, Chain: nil}}}}); err != nil {
+				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-_]*$`, Chain: nil}}}}); err != nil {
 		return result, validation.NewError("containerregistry.ScopeMapsClient", "Get", err.Error())
 	}
 
@@ -477,7 +477,7 @@ func (client ScopeMapsClient) Update(ctx context.Context, resourceGroupName stri
 		{TargetValue: scopeMapName,
 			Constraints: []validation.Constraint{{Target: "scopeMapName", Name: validation.MaxLength, Rule: 50, Chain: nil},
 				{Target: "scopeMapName", Name: validation.MinLength, Rule: 5, Chain: nil},
-				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-]*$`, Chain: nil}}}}); err != nil {
+				{Target: "scopeMapName", Name: validation.Pattern, Rule: `^[a-zA-Z0-9-_]*$`, Chain: nil}}}}); err != nil {
 		return result, validation.NewError("containerregistry.ScopeMapsClient", "Update", err.Error())
 	}