diff --git a/sdk/storage/azure-mgmt-storage/CHANGELOG.md b/sdk/storage/azure-mgmt-storage/CHANGELOG.md
index 4f83e18d59f8..fe54f0c1c0cd 100644
--- a/sdk/storage/azure-mgmt-storage/CHANGELOG.md
+++ b/sdk/storage/azure-mgmt-storage/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History
 
+## 23.0.1 (2025-06-26)
+
+### Other Changes
+
+  - Fix for StorageTaskAssignmentsOperations
+
 ## 23.0.0 (2025-05-15)
 
 ### Breaking Changes
diff --git a/sdk/storage/azure-mgmt-storage/MANIFEST.in b/sdk/storage/azure-mgmt-storage/MANIFEST.in
index 8d61147dea8a..e436aceab38c 100644
--- a/sdk/storage/azure-mgmt-storage/MANIFEST.in
+++ b/sdk/storage/azure-mgmt-storage/MANIFEST.in
@@ -1,4 +1,3 @@
-include _meta.json
 recursive-include tests *.py *.json
 recursive-include samples *.py *.md
 include *.md
diff --git a/sdk/storage/azure-mgmt-storage/_meta.json b/sdk/storage/azure-mgmt-storage/_meta.json
deleted file mode 100644
index 678185d3b930..000000000000
--- a/sdk/storage/azure-mgmt-storage/_meta.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "commit": "03dc846ecc0adf0ec99ba3aca01676df7fa58dc5",
-  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.10.2",
-  "use": [
-    "@autorest/python@6.34.1",
-    "@autorest/modelerfour@4.27.0"
-  ],
-  "autorest_command": "autorest specification/storage/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.34.1 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
-  "readme": "specification/storage/resource-manager/readme.md",
-  "package-2023-01": "2023-07-20 11:56:40 -0700 3e6b4ddca225530c27273d0f816466a905c0151b Microsoft.Storage/stable/2023-01-01/table.json",
-  "package-2022-09": "2022-11-13 19:43:16 -0800 da0cfefaa0e6c237e1e3819f1cb2e11d7606878d Microsoft.Storage/stable/2022-09-01/table.json",
-  "package-2022-05": "2022-08-10 02:57:56 +0000 a98a48c6aced55dcf941778feb4f64c61a4599d2 Microsoft.Storage/stable/2022-05-01/blob.json",
-  "package-2021-09": "2022-03-23 21:52:24 -0700 ce6e1414f546d09834a24dc24814b2b8e932b1de Microsoft.Storage/stable/2021-09-01/table.json",
-  "package-2021-08": "2022-01-25 09:45:23 +0800 d830271b241897bad300f9275ff7b27d502aa6c5 Microsoft.Storage/stable/2021-08-01/storage.json",
-  "package-2021-06": "2021-12-15 14:27:32 +0800 58891380ba22c3565ca884dee3831445f638b545 Microsoft.Storage/stable/2021-06-01/table.json",
-  "package-2021-04": "2021-05-25 21:31:32 -0700 603a4b41fe1100e273b79ef2de752710af724648 Microsoft.Storage/stable/2021-04-01/storage.json",
-  "package-2021-02": "2021-04-08 13:28:48 +0800 4ab6b694b0e02e21b6db2ad4c543b84b8ea5599e Microsoft.Storage/stable/2021-02-01/storage.json",
-  "package-2021-01": "2021-02-20 10:57:16 +0800 882cf967542d55b4c0ebeaaf18bd75429202219a Microsoft.Storage/stable/2021-01-01/file.json",
-  "package-2020-08-preview": "2021-01-28 19:00:27 -0800 d1d09824d124b1b3f9e8ee477e4aeb553bcc3d98 Microsoft.Storage/preview/2020-08-01-preview/storage.json",
-  "package-2019-06": "2021-01-29 00:17:50 -0800 9599cc10bee310950af608411568666585bdd7ba Microsoft.Storage/stable/2019-06-01/storage.json",
-  "package-2019-04": "2021-01-28 18:52:41 -0800 007802587ab816c811c353c524df63b2958f3b89 Microsoft.Storage/stable/2019-04-01/storage.json",
-  "package-2018-11": "2020-02-26 11:14:18 +0800 5181e9f4625fe5a20c86fb6ea8f2f798fce88593 Microsoft.Storage/stable/2018-11-01/storage.json",
-  "package-2018-07-only": "2019-06-26 12:38:19 -0400 26df0a691d94445b2c96d348f5ecc31f6f9a2099 Microsoft.Storage/stable/2018-07-01/storage.json",
-  "package-2018-03-preview-only": "2019-06-26 12:38:19 -0400 26df0a691d94445b2c96d348f5ecc31f6f9a2099 Microsoft.Storage/preview/2018-03-01-preview/storage.json",
-  "package-2018-02": "2019-06-26 12:38:19 -0400 26df0a691d94445b2c96d348f5ecc31f6f9a2099 Microsoft.Storage/stable/2018-02-01/storage.json",
-  "package-2017-10": "2019-06-26 12:38:19 -0400 26df0a691d94445b2c96d348f5ecc31f6f9a2099 Microsoft.Storage/stable/2017-10-01/storage.json",
-  "package-2017-06": "2019-06-26 12:38:19 -0400 26df0a691d94445b2c96d348f5ecc31f6f9a2099 Microsoft.Storage/stable/2017-06-01/storage.json",
-  "package-2016-12": "2020-05-21 10:20:08 +0200 db0f437ba79086e20570d648fe932c4266e7a7ed Microsoft.Storage/stable/2016-12-01/storage.json",
-  "package-2016-01": "2019-06-26 12:38:19 -0400 26df0a691d94445b2c96d348f5ecc31f6f9a2099 Microsoft.Storage/stable/2016-01-01/storage.json",
-  "package-2015-06": "2019-06-26 12:38:19 -0400 26df0a691d94445b2c96d348f5ecc31f6f9a2099 Microsoft.Storage/stable/2015-06-15/storage.json",
-  "package-2023-05": "2024-06-26 09:32:01 -0700 db377f47cf7bf53bf077aa42967112a9783980d5 Microsoft.Storage/stable/2023-05-01/storageTaskAssignments.json"
-}
\ No newline at end of file
diff --git a/sdk/storage/azure-mgmt-storage/_metadata.json b/sdk/storage/azure-mgmt-storage/_metadata.json
new file mode 100644
index 000000000000..20f1a99f5db8
--- /dev/null
+++ b/sdk/storage/azure-mgmt-storage/_metadata.json
@@ -0,0 +1,11 @@
+{
+  "commit": "6c7bb299b1fb029d5f2c8d2c255cd517bc9ac58c",
+  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
+  "autorest": "3.10.2",
+  "use": [
+    "@autorest/python@6.35.0",
+    "@autorest/modelerfour@4.27.0"
+  ],
+  "autorest_command": "autorest specification/storage/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.35.0 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False",
+  "readme": "specification/storage/resource-manager/readme.md"
+}
\ No newline at end of file
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/_version.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/_version.py
index d4fc54da5083..b9cdb240960d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/_version.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/_version.py
@@ -5,4 +5,4 @@
 # license information.
 # --------------------------------------------------------------------------
 
-VERSION = "23.0.0"
+VERSION = "23.0.1"
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_blob_containers_operations.py
index be4ee7f6ed98..01c0f1ec834e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_blob_containers_operations.py
@@ -8,20 +8,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import (
-    Any,
-    AsyncIterable,
-    AsyncIterator,
-    Callable,
-    Dict,
-    IO,
-    Literal,
-    Optional,
-    TypeVar,
-    Union,
-    cast,
-    overload,
-)
+from typing import Any, AsyncIterator, Callable, Dict, IO, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -97,7 +84,7 @@ def list(
         filter: Optional[str] = None,
         include: Optional[Union[str, _models.ListContainersInclude]] = None,
         **kwargs: Any
-    ) -> AsyncIterable["_models.ListContainerItem"]:
+    ) -> AsyncItemPaged["_models.ListContainerItem"]:
         """Lists all containers and does not support a prefix like data plane. Also SRP today does not
         return continuation token.
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_blob_inventory_policies_operations.py
index 62afbcf6a3ac..7d04df30165e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_blob_inventory_policies_operations.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -342,7 +342,7 @@ async def delete(
     @distributed_trace
     def list(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> AsyncIterable["_models.BlobInventoryPolicy"]:
+    ) -> AsyncItemPaged["_models.BlobInventoryPolicy"]:
         """Gets the blob inventory policy associated with the specified storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_blob_services_operations.py
index 819828a926bc..68a9272c091d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_blob_services_operations.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -62,7 +62,7 @@ def __init__(self, *args, **kwargs) -> None:
     @distributed_trace
     def list(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> AsyncIterable["_models.BlobServiceProperties"]:
+    ) -> AsyncItemPaged["_models.BlobServiceProperties"]:
         """List blob services of storage account. It returns a collection of one object named default.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_deleted_accounts_operations.py
index c25c5e2542ce..033b1c957228 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_deleted_accounts_operations.py
@@ -6,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
-from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -55,7 +55,7 @@ def __init__(self, *args, **kwargs) -> None:
         self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer")
 
     @distributed_trace
-    def list(self, **kwargs: Any) -> AsyncIterable["_models.DeletedAccount"]:
+    def list(self, **kwargs: Any) -> AsyncItemPaged["_models.DeletedAccount"]:
         """Lists deleted accounts under the subscription.
 
         :return: An iterator like instance of either DeletedAccount or the result of cls(response)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_encryption_scopes_operations.py
index 8d3e22a2ac4c..3a892d8773fd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_encryption_scopes_operations.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -458,7 +458,7 @@ def list(
         filter: Optional[str] = None,
         include: Optional[Union[str, _models.ListEncryptionScopesInclude]] = None,
         **kwargs: Any
-    ) -> AsyncIterable["_models.EncryptionScope"]:
+    ) -> AsyncItemPaged["_models.EncryptionScope"]:
         """Lists all the encryption scopes available under the specified storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_file_services_operations.py
index be7557899f3c..7f6ed2ec9009 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_file_services_operations.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, AsyncIterable, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -327,7 +327,7 @@ async def get_service_properties(
     @distributed_trace
     def list_service_usages(
         self, resource_group_name: str, account_name: str, maxpagesize: Optional[int] = None, **kwargs: Any
-    ) -> AsyncIterable["_models.FileServiceUsage"]:
+    ) -> AsyncItemPaged["_models.FileServiceUsage"]:
         """Gets the usages of file service in storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_file_shares_operations.py
index 6ddfffdd9cfd..de31815336e3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_file_shares_operations.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -72,7 +72,7 @@ def list(
         filter: Optional[str] = None,
         expand: Optional[str] = None,
         **kwargs: Any
-    ) -> AsyncIterable["_models.FileShareItem"]:
+    ) -> AsyncItemPaged["_models.FileShareItem"]:
         """Lists all shares.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_local_users_operations.py
index 9eea0e433cb0..cf494e7c8c5d 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_local_users_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_local_users_operations.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -71,7 +71,7 @@ def list(
         filter: Optional[str] = None,
         include: Optional[Union[str, _models.ListLocalUserIncludeParam]] = None,
         **kwargs: Any
-    ) -> AsyncIterable["_models.LocalUser"]:
+    ) -> AsyncItemPaged["_models.LocalUser"]:
         """List the local users associated with the storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_network_security_perimeter_configurations_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_network_security_perimeter_configurations_operations.py
index 2193a10ad905..eb8687ff8038 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_network_security_perimeter_configurations_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_network_security_perimeter_configurations_operations.py
@@ -6,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
-from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, Optional, TypeVar, Union, cast
+from typing import Any, AsyncIterator, Callable, Dict, Optional, TypeVar, Union, cast
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -65,7 +65,7 @@ def __init__(self, *args, **kwargs) -> None:
     @distributed_trace
     def list(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> AsyncIterable["_models.NetworkSecurityPerimeterConfiguration"]:
+    ) -> AsyncItemPaged["_models.NetworkSecurityPerimeterConfiguration"]:
         """Gets list of effective NetworkSecurityPerimeterConfiguration for storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_object_replication_policies_operations.py
index 326ae5f1b0bf..1c075442d0a3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_object_replication_policies_operations.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -63,7 +63,7 @@ def __init__(self, *args, **kwargs) -> None:
     @distributed_trace
     def list(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> AsyncIterable["_models.ObjectReplicationPolicy"]:
+    ) -> AsyncItemPaged["_models.ObjectReplicationPolicy"]:
         """List the object replication policies associated with the storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_operations.py
index 907a89074242..467ac7ab53a1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_operations.py
@@ -6,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
-from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -54,7 +54,7 @@ def __init__(self, *args, **kwargs) -> None:
         self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer")
 
     @distributed_trace
-    def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]:
+    def list(self, **kwargs: Any) -> AsyncItemPaged["_models.Operation"]:
         """Lists all of the available Storage Rest API operations.
 
         :return: An iterator like instance of either Operation or the result of cls(response)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_private_endpoint_connections_operations.py
index 9d147dae5157..b1893747f23f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_private_endpoint_connections_operations.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -63,7 +63,7 @@ def __init__(self, *args, **kwargs) -> None:
     @distributed_trace
     def list(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> AsyncIterable["_models.PrivateEndpointConnection"]:
+    ) -> AsyncItemPaged["_models.PrivateEndpointConnection"]:
         """List all the private endpoint connections associated with the storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_queue_operations.py
index cb6ae88dcfbc..704c42423b93 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_queue_operations.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -503,7 +503,7 @@ def list(
         maxpagesize: Optional[str] = None,
         filter: Optional[str] = None,
         **kwargs: Any
-    ) -> AsyncIterable["_models.ListQueue"]:
+    ) -> AsyncItemPaged["_models.ListQueue"]:
         """Gets a list of all the queues under the specified storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_skus_operations.py
index 05c46c02cb21..ea04a7dc7fb5 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_skus_operations.py
@@ -6,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
-from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -54,7 +54,7 @@ def __init__(self, *args, **kwargs) -> None:
         self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer")
 
     @distributed_trace
-    def list(self, **kwargs: Any) -> AsyncIterable["_models.SkuInformation"]:
+    def list(self, **kwargs: Any) -> AsyncItemPaged["_models.SkuInformation"]:
         """Lists the available SKUs supported by Microsoft.Storage for given subscription.
 
         :return: An iterator like instance of either SkuInformation or the result of cls(response)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_accounts_operations.py
index f6a9b57fe30c..978ee62090af 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_accounts_operations.py
@@ -8,20 +8,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import (
-    Any,
-    AsyncIterable,
-    AsyncIterator,
-    Callable,
-    Dict,
-    IO,
-    Literal,
-    Optional,
-    TypeVar,
-    Union,
-    cast,
-    overload,
-)
+from typing import Any, AsyncIterator, Callable, Dict, IO, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -689,7 +676,7 @@ async def update(
         return deserialized  # type: ignore
 
     @distributed_trace
-    def list(self, **kwargs: Any) -> AsyncIterable["_models.StorageAccount"]:
+    def list(self, **kwargs: Any) -> AsyncItemPaged["_models.StorageAccount"]:
         """Lists all the storage accounts available under the subscription. Note that storage keys are not
         returned; use the ListKeys operation for this.
 
@@ -766,7 +753,7 @@ async def get_next(next_link=None):
     @distributed_trace
     def list_by_resource_group(
         self, resource_group_name: str, **kwargs: Any
-    ) -> AsyncIterable["_models.StorageAccount"]:
+    ) -> AsyncItemPaged["_models.StorageAccount"]:
         """Lists all the storage accounts available under the given resource group. Note that storage keys
         are not returned; use the ListKeys operation for this.
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_task_assignment_instances_report_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_task_assignment_instances_report_operations.py
index 1fa6196b68e9..44b998a82deb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_task_assignment_instances_report_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_task_assignment_instances_report_operations.py
@@ -7,7 +7,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
-from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -63,7 +63,7 @@ def list(
         maxpagesize: Optional[int] = None,
         filter: Optional[str] = None,
         **kwargs: Any
-    ) -> AsyncIterable["_models.StorageTaskReportInstance"]:
+    ) -> AsyncItemPaged["_models.StorageTaskReportInstance"]:
         """Fetch the report summary of a single storage task assignment's instances.
 
         :param resource_group_name: The name of the resource group. The name is case insensitive.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_task_assignments_instances_report_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_task_assignments_instances_report_operations.py
index d08e456b6c89..e2b4facbf8bf 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_task_assignments_instances_report_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_task_assignments_instances_report_operations.py
@@ -7,7 +7,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
-from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -62,7 +62,7 @@ def list(
         maxpagesize: Optional[int] = None,
         filter: Optional[str] = None,
         **kwargs: Any
-    ) -> AsyncIterable["_models.StorageTaskReportInstance"]:
+    ) -> AsyncItemPaged["_models.StorageTaskReportInstance"]:
         """Fetch the report summary of all the storage task assignments and instances in an account.
 
         :param resource_group_name: The name of the resource group. The name is case insensitive.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_task_assignments_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_task_assignments_operations.py
index 10b7774ca5ce..a483b55f6b1c 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_task_assignments_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_storage_task_assignments_operations.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, AsyncIterable, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
+from typing import Any, AsyncIterator, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -283,7 +283,8 @@ def get_long_running_output(pipeline_response):
 
         if polling is True:
             polling_method: AsyncPollingMethod = cast(
-                AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+                AsyncPollingMethod,
+                AsyncARMPolling(lro_delay, lro_options={"final-state-via": "azure-async-operation"}, **kwargs),
             )
         elif polling is False:
             polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
@@ -506,7 +507,8 @@ def get_long_running_output(pipeline_response):
 
         if polling is True:
             polling_method: AsyncPollingMethod = cast(
-                AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+                AsyncPollingMethod,
+                AsyncARMPolling(lro_delay, lro_options={"final-state-via": "azure-async-operation"}, **kwargs),
             )
         elif polling is False:
             polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
@@ -693,7 +695,8 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
 
         if polling is True:
             polling_method: AsyncPollingMethod = cast(
-                AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+                AsyncPollingMethod,
+                AsyncARMPolling(lro_delay, lro_options={"final-state-via": "azure-async-operation"}, **kwargs),
             )
         elif polling is False:
             polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
@@ -711,7 +714,7 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
     @distributed_trace
     def list(
         self, resource_group_name: str, account_name: str, maxpagesize: Optional[int] = None, **kwargs: Any
-    ) -> AsyncIterable["_models.StorageTaskAssignment"]:
+    ) -> AsyncItemPaged["_models.StorageTaskAssignment"]:
         """List all the storage task assignments in an account.
 
         :param resource_group_name: The name of the resource group. The name is case insensitive.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_table_operations.py
index 557ddd0c2fd1..27ecdf49bc38 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_table_operations.py
@@ -7,7 +7,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -492,7 +492,7 @@ async def delete(self, resource_group_name: str, account_name: str, table_name:
             return cls(pipeline_response, None, {})  # type: ignore
 
     @distributed_trace
-    def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncIterable["_models.Table"]:
+    def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> AsyncItemPaged["_models.Table"]:
         """Gets a list of all the tables under the specified storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_usages_operations.py
index 01410e8955fc..1ad6b00797fb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/aio/operations/_usages_operations.py
@@ -6,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
-from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core import AsyncPipelineClient
@@ -54,7 +54,7 @@ def __init__(self, *args, **kwargs) -> None:
         self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer")
 
     @distributed_trace
-    def list_by_location(self, location: str, **kwargs: Any) -> AsyncIterable["_models.Usage"]:
+    def list_by_location(self, location: str, **kwargs: Any) -> AsyncItemPaged["_models.Usage"]:
         """Gets the current usage count and the limit for the resources of the location under the
         subscription.
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/models/_models_py3.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/models/_models_py3.py
index b386f186bb04..05e541f7523f 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/models/_models_py3.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/models/_models_py3.py
@@ -9862,7 +9862,7 @@ class TriggerParameters(_serialization.Model):
      ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
      ExecutionTrigger.properties.type is 'RunOnce'.
     :vartype end_by: ~datetime.datetime
-    :ivar start_on: When to start task execution. This is an optional field when
+    :ivar start_on: When to start task execution. This is a required field when
      ExecutionTrigger.properties.type is 'RunOnce'; this property should not be present when
      ExecutionTrigger.properties.type is 'OnSchedule'.
     :vartype start_on: ~datetime.datetime
@@ -9907,7 +9907,7 @@ def __init__(
          ExecutionTrigger.properties.type is 'OnSchedule'; this property should not be present when
          ExecutionTrigger.properties.type is 'RunOnce'.
         :paramtype end_by: ~datetime.datetime
-        :keyword start_on: When to start task execution. This is an optional field when
+        :keyword start_on: When to start task execution. This is a required field when
          ExecutionTrigger.properties.type is 'RunOnce'; this property should not be present when
          ExecutionTrigger.properties.type is 'OnSchedule'.
         :paramtype start_on: ~datetime.datetime
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_blob_containers_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_blob_containers_operations.py
index e3f257d1d837..3aaf456de624 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_blob_containers_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_blob_containers_operations.py
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -628,7 +628,7 @@ class BlobContainersOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -644,7 +644,7 @@ def list(
         filter: Optional[str] = None,
         include: Optional[Union[str, _models.ListContainersInclude]] = None,
         **kwargs: Any
-    ) -> Iterable["_models.ListContainerItem"]:
+    ) -> ItemPaged["_models.ListContainerItem"]:
         """Lists all containers and does not support a prefix like data plane. Also SRP today does not
         return continuation token.
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_blob_inventory_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_blob_inventory_policies_operations.py
index 78cf677cb101..4194455d1406 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_blob_inventory_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_blob_inventory_policies_operations.py
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -206,7 +206,7 @@ class BlobInventoryPoliciesOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -495,7 +495,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
     @distributed_trace
     def list(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> Iterable["_models.BlobInventoryPolicy"]:
+    ) -> ItemPaged["_models.BlobInventoryPolicy"]:
         """Gets the blob inventory policy associated with the specified storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_blob_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_blob_services_operations.py
index d8fe54187907..2f930fdadd4b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_blob_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_blob_services_operations.py
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -160,7 +160,7 @@ class BlobServicesOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -170,7 +170,7 @@ def __init__(self, *args, **kwargs):
     @distributed_trace
     def list(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> Iterable["_models.BlobServiceProperties"]:
+    ) -> ItemPaged["_models.BlobServiceProperties"]:
         """List blob services of storage account. It returns a collection of one object named default.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_deleted_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_deleted_accounts_operations.py
index 4e3b601e36b3..bd1402369323 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_deleted_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_deleted_accounts_operations.py
@@ -7,7 +7,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
-from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -104,7 +104,7 @@ class DeletedAccountsOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -112,7 +112,7 @@ def __init__(self, *args, **kwargs):
         self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer")
 
     @distributed_trace
-    def list(self, **kwargs: Any) -> Iterable["_models.DeletedAccount"]:
+    def list(self, **kwargs: Any) -> ItemPaged["_models.DeletedAccount"]:
         """Lists deleted accounts under the subscription.
 
         :return: An iterator like instance of either DeletedAccount or the result of cls(response)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_encryption_scopes_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_encryption_scopes_operations.py
index e8255fc10ac7..16eb64cc54d1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_encryption_scopes_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_encryption_scopes_operations.py
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -218,7 +218,7 @@ class EncryptionScopesOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -623,7 +623,7 @@ def list(
         filter: Optional[str] = None,
         include: Optional[Union[str, _models.ListEncryptionScopesInclude]] = None,
         **kwargs: Any
-    ) -> Iterable["_models.EncryptionScope"]:
+    ) -> ItemPaged["_models.EncryptionScope"]:
         """Lists all the encryption scopes available under the specified storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_file_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_file_services_operations.py
index 728cebdef51c..e756305ac915 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_file_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_file_services_operations.py
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Literal, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Literal, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -243,7 +243,7 @@ class FileServicesOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -516,7 +516,7 @@ def get_service_properties(
     @distributed_trace
     def list_service_usages(
         self, resource_group_name: str, account_name: str, maxpagesize: Optional[int] = None, **kwargs: Any
-    ) -> Iterable["_models.FileServiceUsage"]:
+    ) -> ItemPaged["_models.FileServiceUsage"]:
         """Gets the usages of file service in storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_file_shares_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_file_shares_operations.py
index 09e0be242361..d01a64c53bf7 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_file_shares_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_file_shares_operations.py
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -364,7 +364,7 @@ class FileSharesOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -380,7 +380,7 @@ def list(
         filter: Optional[str] = None,
         expand: Optional[str] = None,
         **kwargs: Any
-    ) -> Iterable["_models.FileShareItem"]:
+    ) -> ItemPaged["_models.FileShareItem"]:
         """Lists all shares.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_local_users_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_local_users_operations.py
index e0059320bda1..428c7f9db9ff 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_local_users_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_local_users_operations.py
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -281,7 +281,7 @@ class LocalUsersOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -297,7 +297,7 @@ def list(
         filter: Optional[str] = None,
         include: Optional[Union[str, _models.ListLocalUserIncludeParam]] = None,
         **kwargs: Any
-    ) -> Iterable["_models.LocalUser"]:
+    ) -> ItemPaged["_models.LocalUser"]:
         """List the local users associated with the storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_management_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_management_policies_operations.py
index 4bcb89c32f65..f922087d7b53 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_management_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_management_policies_operations.py
@@ -165,7 +165,7 @@ class ManagementPoliciesOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_network_security_perimeter_configurations_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_network_security_perimeter_configurations_operations.py
index f01ce7ab8ecc..7e528e70a6b3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_network_security_perimeter_configurations_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_network_security_perimeter_configurations_operations.py
@@ -7,7 +7,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
-from typing import Any, Callable, Dict, Iterable, Iterator, Optional, TypeVar, Union, cast
+from typing import Any, Callable, Dict, Iterator, Optional, TypeVar, Union, cast
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -176,7 +176,7 @@ class NetworkSecurityPerimeterConfigurationsOperations:  # pylint: disable=name-
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -186,7 +186,7 @@ def __init__(self, *args, **kwargs):
     @distributed_trace
     def list(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> Iterable["_models.NetworkSecurityPerimeterConfiguration"]:
+    ) -> ItemPaged["_models.NetworkSecurityPerimeterConfiguration"]:
         """Gets list of effective NetworkSecurityPerimeterConfiguration for storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_object_replication_policies_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_object_replication_policies_operations.py
index 34cc534e37a8..9373708122bd 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_object_replication_policies_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_object_replication_policies_operations.py
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -200,7 +200,7 @@ class ObjectReplicationPoliciesOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -210,7 +210,7 @@ def __init__(self, *args, **kwargs):
     @distributed_trace
     def list(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> Iterable["_models.ObjectReplicationPolicy"]:
+    ) -> ItemPaged["_models.ObjectReplicationPolicy"]:
         """List the object replication policies associated with the storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_operations.py
index dd6fd991beef..fcc3d7df557b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_operations.py
@@ -6,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
-from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -67,7 +67,7 @@ class Operations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -75,7 +75,7 @@ def __init__(self, *args, **kwargs):
         self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer")
 
     @distributed_trace
-    def list(self, **kwargs: Any) -> Iterable["_models.Operation"]:
+    def list(self, **kwargs: Any) -> ItemPaged["_models.Operation"]:
         """Lists all of the available Storage Rest API operations.
 
         :return: An iterator like instance of either Operation or the result of cls(response)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_private_endpoint_connections_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_private_endpoint_connections_operations.py
index 90f70cfd824f..ff7b44afe5f3 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_private_endpoint_connections_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_private_endpoint_connections_operations.py
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -212,7 +212,7 @@ class PrivateEndpointConnectionsOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -222,7 +222,7 @@ def __init__(self, *args, **kwargs):
     @distributed_trace
     def list(
         self, resource_group_name: str, account_name: str, **kwargs: Any
-    ) -> Iterable["_models.PrivateEndpointConnection"]:
+    ) -> ItemPaged["_models.PrivateEndpointConnection"]:
         """List all the private endpoint connections associated with the storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_private_link_resources_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_private_link_resources_operations.py
index d8198ed861e7..2067deb7431e 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_private_link_resources_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_private_link_resources_operations.py
@@ -82,7 +82,7 @@ class PrivateLinkResourcesOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_queue_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_queue_operations.py
index cae6905b7d35..64126d63c05b 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_queue_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_queue_operations.py
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -273,7 +273,7 @@ class QueueOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -722,7 +722,7 @@ def list(
         maxpagesize: Optional[str] = None,
         filter: Optional[str] = None,
         **kwargs: Any
-    ) -> Iterable["_models.ListQueue"]:
+    ) -> ItemPaged["_models.ListQueue"]:
         """Gets a list of all the queues under the specified storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_queue_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_queue_services_operations.py
index 9dbc0d384933..c5b5226635d9 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_queue_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_queue_services_operations.py
@@ -158,7 +158,7 @@ class QueueServicesOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_skus_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_skus_operations.py
index b4bd63560344..44bce4f0f427 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_skus_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_skus_operations.py
@@ -6,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
-from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -72,7 +72,7 @@ class SkusOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -80,7 +80,7 @@ def __init__(self, *args, **kwargs):
         self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer")
 
     @distributed_trace
-    def list(self, **kwargs: Any) -> Iterable["_models.SkuInformation"]:
+    def list(self, **kwargs: Any) -> ItemPaged["_models.SkuInformation"]:
         """Lists the available SKUs supported by Microsoft.Storage for given subscription.
 
         :return: An iterator like instance of either SkuInformation or the result of cls(response)
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_accounts_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_accounts_operations.py
index 3a9556b66e55..f934d8f13572 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_accounts_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_accounts_operations.py
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Iterator, Literal, Optional, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterator, Literal, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -690,7 +690,7 @@ class StorageAccountsOperations:  # pylint: disable=too-many-public-methods
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -1296,7 +1296,7 @@ def update(
         return deserialized  # type: ignore
 
     @distributed_trace
-    def list(self, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
+    def list(self, **kwargs: Any) -> ItemPaged["_models.StorageAccount"]:
         """Lists all the storage accounts available under the subscription. Note that storage keys are not
         returned; use the ListKeys operation for this.
 
@@ -1371,7 +1371,7 @@ def get_next(next_link=None):
         return ItemPaged(get_next, extract_data)
 
     @distributed_trace
-    def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Iterable["_models.StorageAccount"]:
+    def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> ItemPaged["_models.StorageAccount"]:
         """Lists all the storage accounts available under the given resource group. Note that storage keys
         are not returned; use the ListKeys operation for this.
 
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_task_assignment_instances_report_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_task_assignment_instances_report_operations.py
index a3ca9d1d4a9c..07a2af59ed10 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_task_assignment_instances_report_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_task_assignment_instances_report_operations.py
@@ -7,7 +7,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
-from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -103,7 +103,7 @@ class StorageTaskAssignmentInstancesReportOperations:  # pylint: disable=name-to
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -119,7 +119,7 @@ def list(
         maxpagesize: Optional[int] = None,
         filter: Optional[str] = None,
         **kwargs: Any
-    ) -> Iterable["_models.StorageTaskReportInstance"]:
+    ) -> ItemPaged["_models.StorageTaskReportInstance"]:
         """Fetch the report summary of a single storage task assignment's instances.
 
         :param resource_group_name: The name of the resource group. The name is case insensitive.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_task_assignments_instances_report_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_task_assignments_instances_report_operations.py
index 4f264433238f..cf78793fd9d2 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_task_assignments_instances_report_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_task_assignments_instances_report_operations.py
@@ -7,7 +7,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
-from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -94,7 +94,7 @@ class StorageTaskAssignmentsInstancesReportOperations:  # pylint: disable=name-t
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -109,7 +109,7 @@ def list(
         maxpagesize: Optional[int] = None,
         filter: Optional[str] = None,
         **kwargs: Any
-    ) -> Iterable["_models.StorageTaskReportInstance"]:
+    ) -> ItemPaged["_models.StorageTaskReportInstance"]:
         """Fetch the report summary of all the storage task assignments and instances in an account.
 
         :param resource_group_name: The name of the resource group. The name is case insensitive.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_task_assignments_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_task_assignments_operations.py
index c6e7b7328165..5db472fc6747 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_task_assignments_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_storage_task_assignments_operations.py
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Iterator, Optional, TypeVar, Union, cast, overload
+from typing import Any, Callable, Dict, IO, Iterator, Optional, TypeVar, Union, cast, overload
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -274,7 +274,7 @@ class StorageTaskAssignmentsOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -499,7 +499,7 @@ def get_long_running_output(pipeline_response):
 
         if polling is True:
             polling_method: PollingMethod = cast(
-                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "azure-async-operation"}, **kwargs)
             )
         elif polling is False:
             polling_method = cast(PollingMethod, NoPolling())
@@ -722,7 +722,7 @@ def get_long_running_output(pipeline_response):
 
         if polling is True:
             polling_method: PollingMethod = cast(
-                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "azure-async-operation"}, **kwargs)
             )
         elif polling is False:
             polling_method = cast(PollingMethod, NoPolling())
@@ -909,7 +909,7 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
 
         if polling is True:
             polling_method: PollingMethod = cast(
-                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
+                PollingMethod, ARMPolling(lro_delay, lro_options={"final-state-via": "azure-async-operation"}, **kwargs)
             )
         elif polling is False:
             polling_method = cast(PollingMethod, NoPolling())
@@ -927,7 +927,7 @@ def get_long_running_output(pipeline_response):  # pylint: disable=inconsistent-
     @distributed_trace
     def list(
         self, resource_group_name: str, account_name: str, maxpagesize: Optional[int] = None, **kwargs: Any
-    ) -> Iterable["_models.StorageTaskAssignment"]:
+    ) -> ItemPaged["_models.StorageTaskAssignment"]:
         """List all the storage task assignments in an account.
 
         :param resource_group_name: The name of the resource group. The name is case insensitive.
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_table_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_table_operations.py
index 3fc8015a1af6..233dc2c726eb 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_table_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_table_operations.py
@@ -8,7 +8,7 @@
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
 from io import IOBase
-from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, overload
+from typing import Any, Callable, Dict, IO, Optional, TypeVar, Union, overload
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -241,7 +241,7 @@ class TableOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -681,7 +681,7 @@ def delete(  # pylint: disable=inconsistent-return-statements
             return cls(pipeline_response, None, {})  # type: ignore
 
     @distributed_trace
-    def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> Iterable["_models.Table"]:
+    def list(self, resource_group_name: str, account_name: str, **kwargs: Any) -> ItemPaged["_models.Table"]:
         """Gets a list of all the tables under the specified storage account.
 
         :param resource_group_name: The name of the resource group within the user's subscription. The
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_table_services_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_table_services_operations.py
index eac22c41815d..68d8ba8b0df1 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_table_services_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_table_services_operations.py
@@ -158,7 +158,7 @@ class TableServicesOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
diff --git a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_usages_operations.py b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_usages_operations.py
index ca29663179dc..bd367dde58ca 100644
--- a/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_usages_operations.py
+++ b/sdk/storage/azure-mgmt-storage/azure/mgmt/storage/operations/_usages_operations.py
@@ -6,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 from collections.abc import MutableMapping
-from typing import Any, Callable, Dict, Iterable, Optional, TypeVar
+from typing import Any, Callable, Dict, Optional, TypeVar
 import urllib.parse
 
 from azure.core import PipelineClient
@@ -75,7 +75,7 @@ class UsagesOperations:
 
     models = _models
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         input_args = list(args)
         self._client: PipelineClient = input_args.pop(0) if input_args else kwargs.pop("client")
         self._config: StorageManagementClientConfiguration = input_args.pop(0) if input_args else kwargs.pop("config")
@@ -83,7 +83,7 @@ def __init__(self, *args, **kwargs):
         self._deserialize: Deserializer = input_args.pop(0) if input_args else kwargs.pop("deserializer")
 
     @distributed_trace
-    def list_by_location(self, location: str, **kwargs: Any) -> Iterable["_models.Usage"]:
+    def list_by_location(self, location: str, **kwargs: Any) -> ItemPaged["_models.Usage"]:
         """Gets the current usage count and the limit for the resources of the location under the
         subscription.