diff --git a/CHANGELOG.md b/CHANGELOG.md
index deefa504c3..f11dbb5990 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ FEATURES:
  * **New Resource:** `aws_api_gateway_domain_name` [GH-8353]
 
 IMPROVEMENTS:
+ * core: Names generated with a unique prefix are now sortable based on age [GH-8249]
  * provider/aws: Add Primary Endpoint Address attribute for `aws_elasticache_replication_group` [GH-8385]
  * provider/aws: Add support for `network_mode` to `aws_ecs_task_definition` [GH-8391]
  * provider/openstack: Add `allowed_address_pairs` to `openstack_networking_port_v2` [GH-8257]
diff --git a/builtin/providers/azurerm/resource_arm_search_service.go b/builtin/providers/azurerm/resource_arm_search_service.go
index 69349f344c..ffaa54ffe5 100644
--- a/builtin/providers/azurerm/resource_arm_search_service.go
+++ b/builtin/providers/azurerm/resource_arm_search_service.go
@@ -116,10 +116,9 @@ func resourceArmSearchServiceCreate(d *schema.ResourceData, meta interface{}) er
 
 	log.Printf("[DEBUG] Waiting for Search Service (%s) to become available", d.Get("name"))
 	stateConf := &resource.StateChangeConf{
-		Pending: []string{"provisioning"},
-		Target:  []string{"succeeded"},
-		Refresh: azureStateRefreshFunc(*resp.ID, client, getSearchServiceCommand),
-		// ¯\_(ツ)_/¯
+		Pending:    []string{"provisioning"},
+		Target:     []string{"succeeded"},
+		Refresh:    azureStateRefreshFunc(*resp.ID, client, getSearchServiceCommand),
 		Timeout:    30 * time.Minute,
 		MinTimeout: 15 * time.Second,
 	}