diff --git a/services/iotcentral/mgmt/2018-09-01/iotcentral/CHANGELOG.md b/services/iotcentral/mgmt/2018-09-01/iotcentral/CHANGELOG.md
deleted file mode 100644
index 70c0f188b3c8..000000000000
--- a/services/iotcentral/mgmt/2018-09-01/iotcentral/CHANGELOG.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Generated from https://github.com/Azure/azure-rest-api-specs/tree/3c764635e7d442b3e74caf593029fcd440b3ef82
-
-Code generator @microsoft.azure/autorest.go@~2.1.161
-
-## Breaking Changes
-
-- Function `NewOperationListResultPage` parameter(s) have been changed from `(func(context.Context, OperationListResult) (OperationListResult, error))` to `(OperationListResult, func(context.Context, OperationListResult) (OperationListResult, error))`
-- Function `NewAppListResultPage` parameter(s) have been changed from `(func(context.Context, AppListResult) (AppListResult, error))` to `(AppListResult, func(context.Context, AppListResult) (AppListResult, error))`
-- Function `NewAppTemplatesResultPage` parameter(s) have been changed from `(func(context.Context, AppTemplatesResult) (AppTemplatesResult, error))` to `(AppTemplatesResult, func(context.Context, AppTemplatesResult) (AppTemplatesResult, error))`
diff --git a/services/iotcentral/mgmt/2018-09-01/iotcentral/apps.go b/services/iotcentral/mgmt/2018-09-01/iotcentral/apps.go
index d6e7d8a73a71..194c9cc9203b 100644
--- a/services/iotcentral/mgmt/2018-09-01/iotcentral/apps.go
+++ b/services/iotcentral/mgmt/2018-09-01/iotcentral/apps.go
@@ -477,6 +477,7 @@ func (client AppsClient) ListByResourceGroup(ctx context.Context, resourceGroupN
 	}
 	if result.alr.hasNextLink() && result.alr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -537,7 +538,6 @@ func (client AppsClient) listByResourceGroupNextResults(ctx context.Context, las
 	result, err = client.ListByResourceGroupResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "listByResourceGroupNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
@@ -591,6 +591,7 @@ func (client AppsClient) ListBySubscription(ctx context.Context) (result AppList
 	}
 	if result.alr.hasNextLink() && result.alr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -650,7 +651,6 @@ func (client AppsClient) listBySubscriptionNextResults(ctx context.Context, last
 	result, err = client.ListBySubscriptionResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "listBySubscriptionNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
@@ -704,6 +704,7 @@ func (client AppsClient) ListTemplates(ctx context.Context) (result AppTemplates
 	}
 	if result.atr.hasNextLink() && result.atr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -763,7 +764,6 @@ func (client AppsClient) listTemplatesNextResults(ctx context.Context, lastResul
 	result, err = client.ListTemplatesResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "iotcentral.AppsClient", "listTemplatesNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }
diff --git a/services/iotcentral/mgmt/2018-09-01/iotcentral/models.go b/services/iotcentral/mgmt/2018-09-01/iotcentral/models.go
index 774a6e9e7182..cbc4f148ecd8 100644
--- a/services/iotcentral/mgmt/2018-09-01/iotcentral/models.go
+++ b/services/iotcentral/mgmt/2018-09-01/iotcentral/models.go
@@ -501,8 +501,8 @@ type AppTemplate struct {
 	ManifestID *string `json:"manifestId,omitempty"`
 	// ManifestVersion - READ-ONLY; The version of the template.
 	ManifestVersion *string `json:"manifestVersion,omitempty"`
-	// AppTemplateName - READ-ONLY; The name of the template.
-	AppTemplateName *string `json:"appTemplateName,omitempty"`
+	// Name - READ-ONLY; The name of the template.
+	Name *string `json:"name,omitempty"`
 	// Title - READ-ONLY; The title of the template.
 	Title *string `json:"title,omitempty"`
 	// Order - READ-ONLY; The order of the template in the templates list.
diff --git a/services/iotcentral/mgmt/2018-09-01/iotcentral/operations.go b/services/iotcentral/mgmt/2018-09-01/iotcentral/operations.go
index ffee1c2956a0..c4df74e72c67 100644
--- a/services/iotcentral/mgmt/2018-09-01/iotcentral/operations.go
+++ b/services/iotcentral/mgmt/2018-09-01/iotcentral/operations.go
@@ -74,6 +74,7 @@ func (client OperationsClient) List(ctx context.Context) (result OperationListRe
 	}
 	if result.olr.hasNextLink() && result.olr.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -129,7 +130,6 @@ func (client OperationsClient) listNextResults(ctx context.Context, lastResults
 	result, err = client.ListResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "iotcentral.OperationsClient", "listNextResults", resp, "Failure responding to next results request")
-		return
 	}
 	return
 }