diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp
index a91414cae..2c1f51e4e 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/blob_responses.hpp
@@ -240,7 +240,7 @@ namespace Azure { namespace Storage {
       ListBlobContainersOptions m_operationOptions;
 
       friend class BlobServiceClient;
-      friend class PagedResponse<ListBlobContainersPagedResponse>;
+      friend class Azure::Core::PagedResponse<ListBlobContainersPagedResponse>;
       friend class Files::DataLake::ListFileSystemsPagedResponse;
     };
 
@@ -268,7 +268,7 @@ namespace Azure { namespace Storage {
       std::string m_tagFilterSqlExpression;
 
       friend class BlobServiceClient;
-      friend class PagedResponse<FindBlobsByTagsPagedResponse>;
+      friend class Azure::Core::PagedResponse<FindBlobsByTagsPagedResponse>;
     };
 
     /**
@@ -303,7 +303,7 @@ namespace Azure { namespace Storage {
       ListBlobsOptions m_operationOptions;
 
       friend class BlobContainerClient;
-      friend class PagedResponse<ListBlobsPagedResponse>;
+      friend class Azure::Core::PagedResponse<ListBlobsPagedResponse>;
     };
 
     /**
@@ -351,7 +351,7 @@ namespace Azure { namespace Storage {
       std::string m_delimiter;
 
       friend class BlobContainerClient;
-      friend class PagedResponse<ListBlobsByHierarchyPagedResponse>;
+      friend class Azure::Core::PagedResponse<ListBlobsByHierarchyPagedResponse>;
     };
 
     /**
@@ -387,7 +387,7 @@ namespace Azure { namespace Storage {
       GetPageRangesOptions m_operationOptions;
 
       friend class PageBlobClient;
-      friend class PagedResponse<GetPageRangesPagedResponse>;
+      friend class Azure::Core::PagedResponse<GetPageRangesPagedResponse>;
     };
 
     /**
@@ -431,7 +431,7 @@ namespace Azure { namespace Storage {
       Azure::Nullable<std::string> m_previousSnapshotUrl;
 
       friend class PageBlobClient;
-      friend class PagedResponse<GetPageRangesDiffPagedResponse>;
+      friend class Azure::Core::PagedResponse<GetPageRangesDiffPagedResponse>;
     };
 
   } // namespace Blobs
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp
index de70922c7..66cb35132 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/datalake_responses.hpp
@@ -692,7 +692,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     ListFileSystemsOptions m_operationOptions;
 
     friend class DataLakeServiceClient;
-    friend class PagedResponse<ListFileSystemsPagedResponse>;
+    friend class Azure::Core::PagedResponse<ListFileSystemsPagedResponse>;
   };
 
   /**
@@ -714,7 +714,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
     friend class DataLakeFileSystemClient;
     friend class DataLakeDirectoryClient;
-    friend class PagedResponse<ListPathsPagedResponse>;
+    friend class Azure::Core::PagedResponse<ListPathsPagedResponse>;
   };
 
   /**
@@ -750,7 +750,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     _detail::PathSetAccessControlRecursiveMode m_mode;
 
     friend class DataLakePathClient;
-    friend class PagedResponse<SetPathAccessControlListRecursivePagedResponse>;
+    friend class Azure::Core::PagedResponse<SetPathAccessControlListRecursivePagedResponse>;
   };
 
   using UpdatePathAccessControlListRecursivePagedResponse
diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp
index e495cf1b5..06e36f305 100644
--- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp
+++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/share_responses.hpp
@@ -275,7 +275,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     ListSharesOptions m_operationOptions;
 
     friend class ShareServiceClient;
-    friend class PagedResponse<ListSharesPagedResponse>;
+    friend class Azure::Core::PagedResponse<ListSharesPagedResponse>;
   };
 
   /**
@@ -321,7 +321,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     ListFilesAndDirectoriesOptions m_operationOptions;
 
     friend class ShareDirectoryClient;
-    friend class PagedResponse<ListFilesAndDirectoriesPagedResponse>;
+    friend class Azure::Core::PagedResponse<ListFilesAndDirectoriesPagedResponse>;
   };
 
   /**
@@ -342,7 +342,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     ListFileHandlesOptions m_operationOptions;
 
     friend class ShareFileClient;
-    friend class PagedResponse<ListFileHandlesPagedResponse>;
+    friend class Azure::Core::PagedResponse<ListFileHandlesPagedResponse>;
   };
 
   /**
@@ -367,7 +367,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     ForceCloseAllFileHandlesOptions m_operationOptions;
 
     friend class ShareFileClient;
-    friend class PagedResponse<ForceCloseAllFileHandlesPagedResponse>;
+    friend class Azure::Core::PagedResponse<ForceCloseAllFileHandlesPagedResponse>;
   };
 
   /**
@@ -388,7 +388,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     ListDirectoryHandlesOptions m_operationOptions;
 
     friend class ShareDirectoryClient;
-    friend class PagedResponse<ListDirectoryHandlesPagedResponse>;
+    friend class Azure::Core::PagedResponse<ListDirectoryHandlesPagedResponse>;
   };
 
   /**
@@ -414,7 +414,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     ForceCloseAllDirectoryHandlesOptions m_operationOptions;
 
     friend class ShareDirectoryClient;
-    friend class PagedResponse<ForceCloseAllDirectoryHandlesPagedResponse>;
+    friend class Azure::Core::PagedResponse<ForceCloseAllDirectoryHandlesPagedResponse>;
   };
 
 }}}} // namespace Azure::Storage::Files::Shares