diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 57c8411ed70e..6c3300622d85 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -174,7 +174,7 @@
 
 # PRLabel: %Storage
 # ServiceLabel: %Storage
-/sdk/storage/ @EmmaZhu @XiaoningLiu @vinjiang @jiacfan @ljian3377
+/sdk/storage/ @EmmaZhu @XiaoningLiu @vinjiang @jiacfan @ljian3377 @blueww
 
 # PRLabel: %Synapse
 # ServiceLabel: %Synapse
diff --git a/sdk/storage/storage-blob/package.json b/sdk/storage/storage-blob/package.json
index b1886c1fc469..65f98c6d4e8d 100644
--- a/sdk/storage/storage-blob/package.json
+++ b/sdk/storage/storage-blob/package.json
@@ -87,7 +87,7 @@
   "//metadata": {
     "constantPaths": [
       {
-        "path": "src/generated/src/storageClientContext.ts",
+        "path": "src/generated/src/storageClient.ts",
         "prefix": "packageVersion"
       },
       {
diff --git a/sdk/storage/storage-file-datalake/package.json b/sdk/storage/storage-file-datalake/package.json
index c0c2361229c8..fe22e7167a76 100644
--- a/sdk/storage/storage-file-datalake/package.json
+++ b/sdk/storage/storage-file-datalake/package.json
@@ -84,7 +84,7 @@
   "//metadata": {
     "constantPaths": [
       {
-        "path": "src/generated/src/storageClientContext.ts",
+        "path": "src/generated/src/storageClient.ts",
         "prefix": "packageVersion"
       },
       {
diff --git a/sdk/storage/storage-file-share/package.json b/sdk/storage/storage-file-share/package.json
index b8e471089319..7820b05adf9a 100644
--- a/sdk/storage/storage-file-share/package.json
+++ b/sdk/storage/storage-file-share/package.json
@@ -81,7 +81,7 @@
   "//metadata": {
     "constantPaths": [
       {
-        "path": "src/generated/src/storageClientContext.ts",
+        "path": "src/generated/src/storageClient.ts",
         "prefix": "packageVersion"
       },
       {
diff --git a/sdk/storage/storage-file-share/test/fileserviceclient.spec.ts b/sdk/storage/storage-file-share/test/fileserviceclient.spec.ts
index 693522b515ce..70f988b1cd57 100644
--- a/sdk/storage/storage-file-share/test/fileserviceclient.spec.ts
+++ b/sdk/storage/storage-file-share/test/fileserviceclient.spec.ts
@@ -512,7 +512,7 @@ describe("FileServiceClient Premium", () => {
     assert.ok(propertiesSet.protocol?.smb?.multichannel);
   });
 
-  it("Share Enable Protocol & Share Squash Root", async function (this: Context) {
+  it.skip("Share Enable Protocol & Share Squash Root", async function (this: Context) {
     const shareName = recorder.variable("share", getUniqueName("share"));
     const shareClient = serviceClient.getShareClient(shareName);
 
diff --git a/sdk/storage/storage-queue/package.json b/sdk/storage/storage-queue/package.json
index c7f4d21c7f21..90757f8975f0 100644
--- a/sdk/storage/storage-queue/package.json
+++ b/sdk/storage/storage-queue/package.json
@@ -77,7 +77,7 @@
   "//metadata": {
     "constantPaths": [
       {
-        "path": "src/generated/src/storageClientContext.ts",
+        "path": "src/generated/src/storageClient.ts",
         "prefix": "packageVersion"
       },
       {