diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp
index fec2518df..9762a18b4 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/protocol/blob_rest_client.hpp
@@ -3155,39 +3155,39 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "StorageServiceProperties") == 0)
+              if (node.Name == "StorageServiceProperties")
               {
                 path.emplace_back(XmlTagName::k_StorageServiceProperties);
               }
-              else if (std::strcmp(node.Name, "Logging") == 0)
+              else if (node.Name == "Logging")
               {
                 path.emplace_back(XmlTagName::k_Logging);
               }
-              else if (std::strcmp(node.Name, "HourMetrics") == 0)
+              else if (node.Name == "HourMetrics")
               {
                 path.emplace_back(XmlTagName::k_HourMetrics);
               }
-              else if (std::strcmp(node.Name, "MinuteMetrics") == 0)
+              else if (node.Name == "MinuteMetrics")
               {
                 path.emplace_back(XmlTagName::k_MinuteMetrics);
               }
-              else if (std::strcmp(node.Name, "Cors") == 0)
+              else if (node.Name == "Cors")
               {
                 path.emplace_back(XmlTagName::k_Cors);
               }
-              else if (std::strcmp(node.Name, "CorsRule") == 0)
+              else if (node.Name == "CorsRule")
               {
                 path.emplace_back(XmlTagName::k_CorsRule);
               }
-              else if (std::strcmp(node.Name, "DefaultServiceVersion") == 0)
+              else if (node.Name == "DefaultServiceVersion")
               {
                 path.emplace_back(XmlTagName::k_DefaultServiceVersion);
               }
-              else if (std::strcmp(node.Name, "DeleteRetentionPolicy") == 0)
+              else if (node.Name == "DeleteRetentionPolicy")
               {
                 path.emplace_back(XmlTagName::k_DeleteRetentionPolicy);
               }
-              else if (std::strcmp(node.Name, "StaticWebsite") == 0)
+              else if (node.Name == "StaticWebsite")
               {
                 path.emplace_back(XmlTagName::k_StaticWebsite);
               }
@@ -3282,19 +3282,19 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "EnumerationResults") == 0)
+              if (node.Name == "EnumerationResults")
               {
                 path.emplace_back(XmlTagName::k_EnumerationResults);
               }
-              else if (std::strcmp(node.Name, "NextMarker") == 0)
+              else if (node.Name == "NextMarker")
               {
                 path.emplace_back(XmlTagName::k_NextMarker);
               }
-              else if (std::strcmp(node.Name, "Blobs") == 0)
+              else if (node.Name == "Blobs")
               {
                 path.emplace_back(XmlTagName::k_Blobs);
               }
-              else if (std::strcmp(node.Name, "Blob") == 0)
+              else if (node.Name == "Blob")
               {
                 path.emplace_back(XmlTagName::k_Blob);
               }
@@ -3320,7 +3320,7 @@ namespace Azure { namespace Storage { namespace Blobs {
             else if (node.Type == _internal::XmlNodeType::Attribute)
             {
               if (path.size() == 1 && path[0] == XmlTagName::k_EnumerationResults
-                  && std::strcmp(node.Name, "ServiceEndpoint") == 0)
+                  && node.Name == "ServiceEndpoint")
               {
                 ret.ServiceEndpoint = node.Value;
               }
@@ -3363,23 +3363,23 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "EnumerationResults") == 0)
+              if (node.Name == "EnumerationResults")
               {
                 path.emplace_back(XmlTagName::k_EnumerationResults);
               }
-              else if (std::strcmp(node.Name, "Prefix") == 0)
+              else if (node.Name == "Prefix")
               {
                 path.emplace_back(XmlTagName::k_Prefix);
               }
-              else if (std::strcmp(node.Name, "NextMarker") == 0)
+              else if (node.Name == "NextMarker")
               {
                 path.emplace_back(XmlTagName::k_NextMarker);
               }
-              else if (std::strcmp(node.Name, "Containers") == 0)
+              else if (node.Name == "Containers")
               {
                 path.emplace_back(XmlTagName::k_Containers);
               }
-              else if (std::strcmp(node.Name, "Container") == 0)
+              else if (node.Name == "Container")
               {
                 path.emplace_back(XmlTagName::k_Container);
               }
@@ -3411,7 +3411,7 @@ namespace Azure { namespace Storage { namespace Blobs {
             else if (node.Type == _internal::XmlNodeType::Attribute)
             {
               if (path.size() == 1 && path[0] == XmlTagName::k_EnumerationResults
-                  && std::strcmp(node.Name, "ServiceEndpoint") == 0)
+                  && node.Name == "ServiceEndpoint")
               {
                 ret.ServiceEndpoint = node.Value;
               }
@@ -3450,11 +3450,11 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "StorageServiceStats") == 0)
+              if (node.Name == "StorageServiceStats")
               {
                 path.emplace_back(XmlTagName::k_StorageServiceStats);
               }
-              else if (std::strcmp(node.Name, "GeoReplication") == 0)
+              else if (node.Name == "GeoReplication")
               {
                 path.emplace_back(XmlTagName::k_GeoReplication);
               }
@@ -3512,35 +3512,35 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "UserDelegationKey") == 0)
+              if (node.Name == "UserDelegationKey")
               {
                 path.emplace_back(XmlTagName::k_UserDelegationKey);
               }
-              else if (std::strcmp(node.Name, "SignedOid") == 0)
+              else if (node.Name == "SignedOid")
               {
                 path.emplace_back(XmlTagName::k_SignedOid);
               }
-              else if (std::strcmp(node.Name, "SignedTid") == 0)
+              else if (node.Name == "SignedTid")
               {
                 path.emplace_back(XmlTagName::k_SignedTid);
               }
-              else if (std::strcmp(node.Name, "SignedStart") == 0)
+              else if (node.Name == "SignedStart")
               {
                 path.emplace_back(XmlTagName::k_SignedStart);
               }
-              else if (std::strcmp(node.Name, "SignedExpiry") == 0)
+              else if (node.Name == "SignedExpiry")
               {
                 path.emplace_back(XmlTagName::k_SignedExpiry);
               }
-              else if (std::strcmp(node.Name, "SignedService") == 0)
+              else if (node.Name == "SignedService")
               {
                 path.emplace_back(XmlTagName::k_SignedService);
               }
-              else if (std::strcmp(node.Name, "SignedVersion") == 0)
+              else if (node.Name == "SignedVersion")
               {
                 path.emplace_back(XmlTagName::k_SignedVersion);
               }
-              else if (std::strcmp(node.Name, "Value") == 0)
+              else if (node.Name == "Value")
               {
                 path.emplace_back(XmlTagName::k_Value);
               }
@@ -3632,23 +3632,23 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "Version") == 0)
+              if (node.Name == "Version")
               {
                 path.emplace_back(XmlTagName::k_Version);
               }
-              else if (std::strcmp(node.Name, "Delete") == 0)
+              else if (node.Name == "Delete")
               {
                 path.emplace_back(XmlTagName::k_Delete);
               }
-              else if (std::strcmp(node.Name, "Read") == 0)
+              else if (node.Name == "Read")
               {
                 path.emplace_back(XmlTagName::k_Read);
               }
-              else if (std::strcmp(node.Name, "Write") == 0)
+              else if (node.Name == "Write")
               {
                 path.emplace_back(XmlTagName::k_Write);
               }
-              else if (std::strcmp(node.Name, "RetentionPolicy") == 0)
+              else if (node.Name == "RetentionPolicy")
               {
                 path.emplace_back(XmlTagName::k_RetentionPolicy);
               }
@@ -3670,15 +3670,15 @@ namespace Azure { namespace Storage { namespace Blobs {
               }
               else if (path.size() == 1 && path[0] == XmlTagName::k_Delete)
               {
-                ret.Delete = std::strcmp(node.Value, "true") == 0;
+                ret.Delete = node.Value == "true";
               }
               else if (path.size() == 1 && path[0] == XmlTagName::k_Read)
               {
-                ret.Read = std::strcmp(node.Value, "true") == 0;
+                ret.Read = node.Value == "true";
               }
               else if (path.size() == 1 && path[0] == XmlTagName::k_Write)
               {
-                ret.Write = std::strcmp(node.Value, "true") == 0;
+                ret.Write = node.Value == "true";
               }
             }
           }
@@ -3730,71 +3730,71 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "Name") == 0)
+              if (node.Name == "Name")
               {
                 path.emplace_back(XmlTagName::k_Name);
               }
-              else if (std::strcmp(node.Name, "Properties") == 0)
+              else if (node.Name == "Properties")
               {
                 path.emplace_back(XmlTagName::k_Properties);
               }
-              else if (std::strcmp(node.Name, "Etag") == 0)
+              else if (node.Name == "Etag")
               {
                 path.emplace_back(XmlTagName::k_Etag);
               }
-              else if (std::strcmp(node.Name, "Last-Modified") == 0)
+              else if (node.Name == "Last-Modified")
               {
                 path.emplace_back(XmlTagName::k_LastModified);
               }
-              else if (std::strcmp(node.Name, "PublicAccess") == 0)
+              else if (node.Name == "PublicAccess")
               {
                 path.emplace_back(XmlTagName::k_PublicAccess);
               }
-              else if (std::strcmp(node.Name, "HasImmutabilityPolicy") == 0)
+              else if (node.Name == "HasImmutabilityPolicy")
               {
                 path.emplace_back(XmlTagName::k_HasImmutabilityPolicy);
               }
-              else if (std::strcmp(node.Name, "HasLegalHold") == 0)
+              else if (node.Name == "HasLegalHold")
               {
                 path.emplace_back(XmlTagName::k_HasLegalHold);
               }
-              else if (std::strcmp(node.Name, "LeaseStatus") == 0)
+              else if (node.Name == "LeaseStatus")
               {
                 path.emplace_back(XmlTagName::k_LeaseStatus);
               }
-              else if (std::strcmp(node.Name, "LeaseState") == 0)
+              else if (node.Name == "LeaseState")
               {
                 path.emplace_back(XmlTagName::k_LeaseState);
               }
-              else if (std::strcmp(node.Name, "LeaseDuration") == 0)
+              else if (node.Name == "LeaseDuration")
               {
                 path.emplace_back(XmlTagName::k_LeaseDuration);
               }
-              else if (std::strcmp(node.Name, "DefaultEncryptionScope") == 0)
+              else if (node.Name == "DefaultEncryptionScope")
               {
                 path.emplace_back(XmlTagName::k_DefaultEncryptionScope);
               }
-              else if (std::strcmp(node.Name, "DenyEncryptionScopeOverride") == 0)
+              else if (node.Name == "DenyEncryptionScopeOverride")
               {
                 path.emplace_back(XmlTagName::k_DenyEncryptionScopeOverride);
               }
-              else if (std::strcmp(node.Name, "Metadata") == 0)
+              else if (node.Name == "Metadata")
               {
                 path.emplace_back(XmlTagName::k_Metadata);
               }
-              else if (std::strcmp(node.Name, "Deleted") == 0)
+              else if (node.Name == "Deleted")
               {
                 path.emplace_back(XmlTagName::k_Deleted);
               }
-              else if (std::strcmp(node.Name, "Version") == 0)
+              else if (node.Name == "Version")
               {
                 path.emplace_back(XmlTagName::k_Version);
               }
-              else if (std::strcmp(node.Name, "DeletedTime") == 0)
+              else if (node.Name == "DeletedTime")
               {
                 path.emplace_back(XmlTagName::k_DeletedTime);
               }
-              else if (std::strcmp(node.Name, "RemainingRetentionDays") == 0)
+              else if (node.Name == "RemainingRetentionDays")
               {
                 path.emplace_back(XmlTagName::k_RemainingRetentionDays);
               }
@@ -3837,13 +3837,13 @@ namespace Azure { namespace Storage { namespace Blobs {
                   path.size() == 2 && path[0] == XmlTagName::k_Properties
                   && path[1] == XmlTagName::k_HasImmutabilityPolicy)
               {
-                ret.Details.HasImmutabilityPolicy = std::strcmp(node.Value, "true") == 0;
+                ret.Details.HasImmutabilityPolicy = node.Value == "true";
               }
               else if (
                   path.size() == 2 && path[0] == XmlTagName::k_Properties
                   && path[1] == XmlTagName::k_HasLegalHold)
               {
-                ret.Details.HasLegalHold = std::strcmp(node.Value, "true") == 0;
+                ret.Details.HasLegalHold = node.Value == "true";
               }
               else if (
                   path.size() == 2 && path[0] == XmlTagName::k_Properties
@@ -3873,11 +3873,11 @@ namespace Azure { namespace Storage { namespace Blobs {
                   path.size() == 2 && path[0] == XmlTagName::k_Properties
                   && path[1] == XmlTagName::k_DenyEncryptionScopeOverride)
               {
-                ret.Details.PreventEncryptionScopeOverride = std::strcmp(node.Value, "true") == 0;
+                ret.Details.PreventEncryptionScopeOverride = node.Value == "true";
               }
               else if (path.size() == 1 && path[0] == XmlTagName::k_Deleted)
               {
-                ret.IsDeleted = std::strcmp(node.Value, "true") == 0;
+                ret.IsDeleted = node.Value == "true";
               }
               else if (path.size() == 1 && path[0] == XmlTagName::k_Version)
               {
@@ -3934,23 +3934,23 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "AllowedOrigins") == 0)
+              if (node.Name == "AllowedOrigins")
               {
                 path.emplace_back(XmlTagName::k_AllowedOrigins);
               }
-              else if (std::strcmp(node.Name, "AllowedMethods") == 0)
+              else if (node.Name == "AllowedMethods")
               {
                 path.emplace_back(XmlTagName::k_AllowedMethods);
               }
-              else if (std::strcmp(node.Name, "MaxAgeInSeconds") == 0)
+              else if (node.Name == "MaxAgeInSeconds")
               {
                 path.emplace_back(XmlTagName::k_MaxAgeInSeconds);
               }
-              else if (std::strcmp(node.Name, "ExposedHeaders") == 0)
+              else if (node.Name == "ExposedHeaders")
               {
                 path.emplace_back(XmlTagName::k_ExposedHeaders);
               }
-              else if (std::strcmp(node.Name, "AllowedHeaders") == 0)
+              else if (node.Name == "AllowedHeaders")
               {
                 path.emplace_back(XmlTagName::k_AllowedHeaders);
               }
@@ -4016,11 +4016,11 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "Status") == 0)
+              if (node.Name == "Status")
               {
                 path.emplace_back(XmlTagName::k_Status);
               }
-              else if (std::strcmp(node.Name, "LastSyncTime") == 0)
+              else if (node.Name == "LastSyncTime")
               {
                 path.emplace_back(XmlTagName::k_LastSyncTime);
               }
@@ -4077,19 +4077,19 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "Version") == 0)
+              if (node.Name == "Version")
               {
                 path.emplace_back(XmlTagName::k_Version);
               }
-              else if (std::strcmp(node.Name, "Enabled") == 0)
+              else if (node.Name == "Enabled")
               {
                 path.emplace_back(XmlTagName::k_Enabled);
               }
-              else if (std::strcmp(node.Name, "IncludeAPIs") == 0)
+              else if (node.Name == "IncludeAPIs")
               {
                 path.emplace_back(XmlTagName::k_IncludeAPIs);
               }
-              else if (std::strcmp(node.Name, "RetentionPolicy") == 0)
+              else if (node.Name == "RetentionPolicy")
               {
                 path.emplace_back(XmlTagName::k_RetentionPolicy);
               }
@@ -4111,11 +4111,11 @@ namespace Azure { namespace Storage { namespace Blobs {
               }
               else if (path.size() == 1 && path[0] == XmlTagName::k_Enabled)
               {
-                ret.IsEnabled = std::strcmp(node.Value, "true") == 0;
+                ret.IsEnabled = node.Value == "true";
               }
               else if (path.size() == 1 && path[0] == XmlTagName::k_IncludeAPIs)
               {
-                ret.IncludeApis = std::strcmp(node.Value, "true") == 0;
+                ret.IncludeApis = node.Value == "true";
               }
             }
           }
@@ -4152,11 +4152,11 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "Enabled") == 0)
+              if (node.Name == "Enabled")
               {
                 path.emplace_back(XmlTagName::k_Enabled);
               }
-              else if (std::strcmp(node.Name, "Days") == 0)
+              else if (node.Name == "Days")
               {
                 path.emplace_back(XmlTagName::k_Days);
               }
@@ -4169,7 +4169,7 @@ namespace Azure { namespace Storage { namespace Blobs {
             {
               if (path.size() == 1 && path[0] == XmlTagName::k_Enabled)
               {
-                ret.IsEnabled = std::strcmp(node.Value, "true") == 0;
+                ret.IsEnabled = node.Value == "true";
               }
               else if (path.size() == 1 && path[0] == XmlTagName::k_Days)
               {
@@ -4212,19 +4212,19 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "Enabled") == 0)
+              if (node.Name == "Enabled")
               {
                 path.emplace_back(XmlTagName::k_Enabled);
               }
-              else if (std::strcmp(node.Name, "IndexDocument") == 0)
+              else if (node.Name == "IndexDocument")
               {
                 path.emplace_back(XmlTagName::k_IndexDocument);
               }
-              else if (std::strcmp(node.Name, "DefaultIndexDocumentPath") == 0)
+              else if (node.Name == "DefaultIndexDocumentPath")
               {
                 path.emplace_back(XmlTagName::k_DefaultIndexDocumentPath);
               }
-              else if (std::strcmp(node.Name, "ErrorDocument404Path") == 0)
+              else if (node.Name == "ErrorDocument404Path")
               {
                 path.emplace_back(XmlTagName::k_ErrorDocument404Path);
               }
@@ -4237,7 +4237,7 @@ namespace Azure { namespace Storage { namespace Blobs {
             {
               if (path.size() == 1 && path[0] == XmlTagName::k_Enabled)
               {
-                ret.IsEnabled = std::strcmp(node.Value, "true") == 0;
+                ret.IsEnabled = node.Value == "true";
               }
               else if (path.size() == 1 && path[0] == XmlTagName::k_IndexDocument)
               {
@@ -4286,11 +4286,11 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "Name") == 0)
+              if (node.Name == "Name")
               {
                 path.emplace_back(XmlTagName::k_Name);
               }
-              else if (std::strcmp(node.Name, "ContainerName") == 0)
+              else if (node.Name == "ContainerName")
               {
                 path.emplace_back(XmlTagName::k_ContainerName);
               }
@@ -4342,7 +4342,7 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (depth == 1 && node.Type == _internal::XmlNodeType::Text)
             {
-              ret.emplace(std::move(key), std::string(node.Value));
+              ret.emplace(std::move(key), node.Value);
             }
           }
           return ret;
@@ -4356,22 +4356,18 @@ namespace Azure { namespace Storage { namespace Blobs {
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Start"});
           writer.Write(_internal::XmlNode{
               _internal::XmlNodeType::Text,
-              nullptr,
-              options.StartsOn
-                  .ToString(
-                      Azure::DateTime::DateFormat::Rfc3339,
-                      Azure::DateTime::TimeFractionFormat::Truncate)
-                  .data()});
+              std::string(),
+              options.StartsOn.ToString(
+                  Azure::DateTime::DateFormat::Rfc3339,
+                  Azure::DateTime::TimeFractionFormat::Truncate)});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Expiry"});
           writer.Write(_internal::XmlNode{
               _internal::XmlNodeType::Text,
-              nullptr,
-              options.ExpiresOn
-                  .ToString(
-                      Azure::DateTime::DateFormat::Rfc3339,
-                      Azure::DateTime::TimeFractionFormat::Truncate)
-                  .data()});
+              std::string(),
+              options.ExpiresOn.ToString(
+                  Azure::DateTime::DateFormat::Rfc3339,
+                  Azure::DateTime::TimeFractionFormat::Truncate)});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
         }
@@ -4411,8 +4407,8 @@ namespace Azure { namespace Storage { namespace Blobs {
                 _internal::XmlNode{_internal::XmlNodeType::StartTag, "DefaultServiceVersion"});
             writer.Write(_internal::XmlNode{
                 _internal::XmlNodeType::Text,
-                nullptr,
-                options.DefaultServiceVersion.Value().data()});
+                std::string(),
+                options.DefaultServiceVersion.Value()});
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           }
           writer.Write(
@@ -4430,19 +4426,19 @@ namespace Azure { namespace Storage { namespace Blobs {
         {
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Version"});
           writer.Write(
-              _internal::XmlNode{_internal::XmlNodeType::Text, nullptr, options.Version.data()});
+              _internal::XmlNode{_internal::XmlNodeType::Text, std::string(), options.Version});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Delete"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, options.Delete ? "true" : "false"});
+              _internal::XmlNodeType::Text, std::string(), options.Delete ? "true" : "false"});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Read"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, options.Read ? "true" : "false"});
+              _internal::XmlNodeType::Text, std::string(), options.Read ? "true" : "false"});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Write"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, options.Write ? "true" : "false"});
+              _internal::XmlNodeType::Text, std::string(), options.Write ? "true" : "false"});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "RetentionPolicy"});
           RetentionPolicyToXml(writer, options.RetentionPolicy);
@@ -4454,25 +4450,25 @@ namespace Azure { namespace Storage { namespace Blobs {
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "CorsRule"});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "AllowedOrigins"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, options.AllowedOrigins.data()});
+              _internal::XmlNodeType::Text, std::string(), options.AllowedOrigins});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "AllowedMethods"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, options.AllowedMethods.data()});
+              _internal::XmlNodeType::Text, std::string(), options.AllowedMethods});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "AllowedHeaders"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, options.AllowedHeaders.data()});
+              _internal::XmlNodeType::Text, std::string(), options.AllowedHeaders});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "ExposedHeaders"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, options.ExposedHeaders.data()});
+              _internal::XmlNodeType::Text, std::string(), options.ExposedHeaders});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "MaxAgeInSeconds"});
           writer.Write(_internal::XmlNode{
               _internal::XmlNodeType::Text,
-              nullptr,
-              std::to_string(options.MaxAgeInSeconds).data()});
+              std::string(),
+              std::to_string(options.MaxAgeInSeconds)});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
         }
@@ -4481,18 +4477,18 @@ namespace Azure { namespace Storage { namespace Blobs {
         {
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Version"});
           writer.Write(
-              _internal::XmlNode{_internal::XmlNodeType::Text, nullptr, options.Version.data()});
+              _internal::XmlNode{_internal::XmlNodeType::Text, std::string(), options.Version});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Enabled"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, options.IsEnabled ? "true" : "false"});
+              _internal::XmlNodeType::Text, std::string(), options.IsEnabled ? "true" : "false"});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           if (options.IncludeApis.HasValue())
           {
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "IncludeAPIs"});
             writer.Write(_internal::XmlNode{
                 _internal::XmlNodeType::Text,
-                nullptr,
+                std::string(),
                 options.IncludeApis.Value() ? "true" : "false"});
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           }
@@ -4507,15 +4503,13 @@ namespace Azure { namespace Storage { namespace Blobs {
         {
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Enabled"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, options.IsEnabled ? "true" : "false"});
+              _internal::XmlNodeType::Text, std::string(), options.IsEnabled ? "true" : "false"});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           if (options.Days.HasValue())
           {
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Days"});
             writer.Write(_internal::XmlNode{
-                _internal::XmlNodeType::Text,
-                nullptr,
-                std::to_string(options.Days.Value()).data()});
+                _internal::XmlNodeType::Text, std::string(), std::to_string(options.Days.Value())});
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           }
         }
@@ -4524,13 +4518,13 @@ namespace Azure { namespace Storage { namespace Blobs {
         {
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Enabled"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, options.IsEnabled ? "true" : "false"});
+              _internal::XmlNodeType::Text, std::string(), options.IsEnabled ? "true" : "false"});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           if (options.IndexDocument.HasValue())
           {
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "IndexDocument"});
             writer.Write(_internal::XmlNode{
-                _internal::XmlNodeType::Text, nullptr, options.IndexDocument.Value().data()});
+                _internal::XmlNodeType::Text, std::string(), options.IndexDocument.Value()});
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           }
           if (options.DefaultIndexDocumentPath.HasValue())
@@ -4539,8 +4533,8 @@ namespace Azure { namespace Storage { namespace Blobs {
                 _internal::XmlNode{_internal::XmlNodeType::StartTag, "DefaultIndexDocumentPath"});
             writer.Write(_internal::XmlNode{
                 _internal::XmlNodeType::Text,
-                nullptr,
-                options.DefaultIndexDocumentPath.Value().data()});
+                std::string(),
+                options.DefaultIndexDocumentPath.Value()});
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           }
           if (options.ErrorDocument404Path.HasValue())
@@ -4548,9 +4542,7 @@ namespace Azure { namespace Storage { namespace Blobs {
             writer.Write(
                 _internal::XmlNode{_internal::XmlNodeType::StartTag, "ErrorDocument404Path"});
             writer.Write(_internal::XmlNode{
-                _internal::XmlNodeType::Text,
-                nullptr,
-                options.ErrorDocument404Path.Value().data()});
+                _internal::XmlNodeType::Text, std::string(), options.ErrorDocument404Path.Value()});
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           }
         }
@@ -5425,11 +5417,11 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "SignedIdentifiers") == 0)
+              if (node.Name == "SignedIdentifiers")
               {
                 path.emplace_back(XmlTagName::k_SignedIdentifiers);
               }
-              else if (std::strcmp(node.Name, "SignedIdentifier") == 0)
+              else if (node.Name == "SignedIdentifier")
               {
                 path.emplace_back(XmlTagName::k_SignedIdentifier);
               }
@@ -5488,35 +5480,35 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "EnumerationResults") == 0)
+              if (node.Name == "EnumerationResults")
               {
                 path.emplace_back(XmlTagName::k_EnumerationResults);
               }
-              else if (std::strcmp(node.Name, "Prefix") == 0)
+              else if (node.Name == "Prefix")
               {
                 path.emplace_back(XmlTagName::k_Prefix);
               }
-              else if (std::strcmp(node.Name, "Delimiter") == 0)
+              else if (node.Name == "Delimiter")
               {
                 path.emplace_back(XmlTagName::k_Delimiter);
               }
-              else if (std::strcmp(node.Name, "NextMarker") == 0)
+              else if (node.Name == "NextMarker")
               {
                 path.emplace_back(XmlTagName::k_NextMarker);
               }
-              else if (std::strcmp(node.Name, "Blobs") == 0)
+              else if (node.Name == "Blobs")
               {
                 path.emplace_back(XmlTagName::k_Blobs);
               }
-              else if (std::strcmp(node.Name, "Blob") == 0)
+              else if (node.Name == "Blob")
               {
                 path.emplace_back(XmlTagName::k_Blob);
               }
-              else if (std::strcmp(node.Name, "BlobPrefix") == 0)
+              else if (node.Name == "BlobPrefix")
               {
                 path.emplace_back(XmlTagName::k_BlobPrefix);
               }
-              else if (std::strcmp(node.Name, "Name") == 0)
+              else if (node.Name == "Name")
               {
                 path.emplace_back(XmlTagName::k_Name);
               }
@@ -5561,13 +5553,13 @@ namespace Azure { namespace Storage { namespace Blobs {
             else if (node.Type == _internal::XmlNodeType::Attribute)
             {
               if (path.size() == 1 && path[0] == XmlTagName::k_EnumerationResults
-                  && std::strcmp(node.Name, "ServiceEndpoint") == 0)
+                  && node.Name == "ServiceEndpoint")
               {
                 ret.ServiceEndpoint = node.Value;
               }
               else if (
                   path.size() == 1 && path[0] == XmlTagName::k_EnumerationResults
-                  && std::strcmp(node.Name, "ContainerName") == 0)
+                  && node.Name == "ContainerName")
               {
                 ret.BlobContainerName = node.Value;
               }
@@ -5610,23 +5602,23 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "EnumerationResults") == 0)
+              if (node.Name == "EnumerationResults")
               {
                 path.emplace_back(XmlTagName::k_EnumerationResults);
               }
-              else if (std::strcmp(node.Name, "Prefix") == 0)
+              else if (node.Name == "Prefix")
               {
                 path.emplace_back(XmlTagName::k_Prefix);
               }
-              else if (std::strcmp(node.Name, "NextMarker") == 0)
+              else if (node.Name == "NextMarker")
               {
                 path.emplace_back(XmlTagName::k_NextMarker);
               }
-              else if (std::strcmp(node.Name, "Blobs") == 0)
+              else if (node.Name == "Blobs")
               {
                 path.emplace_back(XmlTagName::k_Blobs);
               }
-              else if (std::strcmp(node.Name, "Blob") == 0)
+              else if (node.Name == "Blob")
               {
                 path.emplace_back(XmlTagName::k_Blob);
               }
@@ -5658,13 +5650,13 @@ namespace Azure { namespace Storage { namespace Blobs {
             else if (node.Type == _internal::XmlNodeType::Attribute)
             {
               if (path.size() == 1 && path[0] == XmlTagName::k_EnumerationResults
-                  && std::strcmp(node.Name, "ServiceEndpoint") == 0)
+                  && node.Name == "ServiceEndpoint")
               {
                 ret.ServiceEndpoint = node.Value;
               }
               else if (
                   path.size() == 1 && path[0] == XmlTagName::k_EnumerationResults
-                  && std::strcmp(node.Name, "ContainerName") == 0)
+                  && node.Name == "ContainerName")
               {
                 ret.BlobContainerName = node.Value;
               }
@@ -5731,123 +5723,123 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "Name") == 0)
+              if (node.Name == "Name")
               {
                 path.emplace_back(XmlTagName::k_Name);
               }
-              else if (std::strcmp(node.Name, "Deleted") == 0)
+              else if (node.Name == "Deleted")
               {
                 path.emplace_back(XmlTagName::k_Deleted);
               }
-              else if (std::strcmp(node.Name, "Snapshot") == 0)
+              else if (node.Name == "Snapshot")
               {
                 path.emplace_back(XmlTagName::k_Snapshot);
               }
-              else if (std::strcmp(node.Name, "VersionId") == 0)
+              else if (node.Name == "VersionId")
               {
                 path.emplace_back(XmlTagName::k_VersionId);
               }
-              else if (std::strcmp(node.Name, "IsCurrentVersion") == 0)
+              else if (node.Name == "IsCurrentVersion")
               {
                 path.emplace_back(XmlTagName::k_IsCurrentVersion);
               }
-              else if (std::strcmp(node.Name, "Properties") == 0)
+              else if (node.Name == "Properties")
               {
                 path.emplace_back(XmlTagName::k_Properties);
               }
-              else if (std::strcmp(node.Name, "Content-Type") == 0)
+              else if (node.Name == "Content-Type")
               {
                 path.emplace_back(XmlTagName::k_ContentType);
               }
-              else if (std::strcmp(node.Name, "Content-Encoding") == 0)
+              else if (node.Name == "Content-Encoding")
               {
                 path.emplace_back(XmlTagName::k_ContentEncoding);
               }
-              else if (std::strcmp(node.Name, "Content-Language") == 0)
+              else if (node.Name == "Content-Language")
               {
                 path.emplace_back(XmlTagName::k_ContentLanguage);
               }
-              else if (std::strcmp(node.Name, "Content-MD5") == 0)
+              else if (node.Name == "Content-MD5")
               {
                 path.emplace_back(XmlTagName::k_ContentMD5);
               }
-              else if (std::strcmp(node.Name, "Cache-Control") == 0)
+              else if (node.Name == "Cache-Control")
               {
                 path.emplace_back(XmlTagName::k_CacheControl);
               }
-              else if (std::strcmp(node.Name, "Content-Disposition") == 0)
+              else if (node.Name == "Content-Disposition")
               {
                 path.emplace_back(XmlTagName::k_ContentDisposition);
               }
-              else if (std::strcmp(node.Name, "Creation-Time") == 0)
+              else if (node.Name == "Creation-Time")
               {
                 path.emplace_back(XmlTagName::k_CreationTime);
               }
-              else if (std::strcmp(node.Name, "Expiry-Time") == 0)
+              else if (node.Name == "Expiry-Time")
               {
                 path.emplace_back(XmlTagName::k_ExpiryTime);
               }
-              else if (std::strcmp(node.Name, "LastAccessTime") == 0)
+              else if (node.Name == "LastAccessTime")
               {
                 path.emplace_back(XmlTagName::k_LastAccessTime);
               }
-              else if (std::strcmp(node.Name, "Last-Modified") == 0)
+              else if (node.Name == "Last-Modified")
               {
                 path.emplace_back(XmlTagName::k_LastModified);
               }
-              else if (std::strcmp(node.Name, "Etag") == 0)
+              else if (node.Name == "Etag")
               {
                 path.emplace_back(XmlTagName::k_Etag);
               }
-              else if (std::strcmp(node.Name, "Content-Length") == 0)
+              else if (node.Name == "Content-Length")
               {
                 path.emplace_back(XmlTagName::k_ContentLength);
               }
-              else if (std::strcmp(node.Name, "BlobType") == 0)
+              else if (node.Name == "BlobType")
               {
                 path.emplace_back(XmlTagName::k_BlobType);
               }
-              else if (std::strcmp(node.Name, "AccessTier") == 0)
+              else if (node.Name == "AccessTier")
               {
                 path.emplace_back(XmlTagName::k_AccessTier);
               }
-              else if (std::strcmp(node.Name, "AccessTierInferred") == 0)
+              else if (node.Name == "AccessTierInferred")
               {
                 path.emplace_back(XmlTagName::k_AccessTierInferred);
               }
-              else if (std::strcmp(node.Name, "LeaseStatus") == 0)
+              else if (node.Name == "LeaseStatus")
               {
                 path.emplace_back(XmlTagName::k_LeaseStatus);
               }
-              else if (std::strcmp(node.Name, "LeaseState") == 0)
+              else if (node.Name == "LeaseState")
               {
                 path.emplace_back(XmlTagName::k_LeaseState);
               }
-              else if (std::strcmp(node.Name, "LeaseDuration") == 0)
+              else if (node.Name == "LeaseDuration")
               {
                 path.emplace_back(XmlTagName::k_LeaseDuration);
               }
-              else if (std::strcmp(node.Name, "ServerEncrypted") == 0)
+              else if (node.Name == "ServerEncrypted")
               {
                 path.emplace_back(XmlTagName::k_ServerEncrypted);
               }
-              else if (std::strcmp(node.Name, "EncryptionKeySHA256") == 0)
+              else if (node.Name == "EncryptionKeySHA256")
               {
                 path.emplace_back(XmlTagName::k_EncryptionKeySHA256);
               }
-              else if (std::strcmp(node.Name, "Sealed") == 0)
+              else if (node.Name == "Sealed")
               {
                 path.emplace_back(XmlTagName::k_Sealed);
               }
-              else if (std::strcmp(node.Name, "x-ms-blob-sequence-number") == 0)
+              else if (node.Name == "x-ms-blob-sequence-number")
               {
                 path.emplace_back(XmlTagName::k_xmsblobsequencenumber);
               }
-              else if (std::strcmp(node.Name, "Metadata") == 0)
+              else if (node.Name == "Metadata")
               {
                 path.emplace_back(XmlTagName::k_Metadata);
               }
-              else if (std::strcmp(node.Name, "OrMetadata") == 0)
+              else if (node.Name == "OrMetadata")
               {
                 path.emplace_back(XmlTagName::k_OrMetadata);
               }
@@ -5875,7 +5867,7 @@ namespace Azure { namespace Storage { namespace Blobs {
               }
               else if (path.size() == 1 && path[0] == XmlTagName::k_Deleted)
               {
-                ret.IsDeleted = std::strcmp(node.Value, "true") == 0;
+                ret.IsDeleted = node.Value == "true";
               }
               else if (path.size() == 1 && path[0] == XmlTagName::k_Snapshot)
               {
@@ -5887,7 +5879,7 @@ namespace Azure { namespace Storage { namespace Blobs {
               }
               else if (path.size() == 1 && path[0] == XmlTagName::k_IsCurrentVersion)
               {
-                ret.IsCurrentVersion = std::strcmp(node.Value, "true") == 0;
+                ret.IsCurrentVersion = node.Value == "true";
               }
               else if (
                   path.size() == 2 && path[0] == XmlTagName::k_Properties
@@ -5982,7 +5974,7 @@ namespace Azure { namespace Storage { namespace Blobs {
                   path.size() == 2 && path[0] == XmlTagName::k_Properties
                   && path[1] == XmlTagName::k_AccessTierInferred)
               {
-                ret.Details.IsAccessTierInferred = std::strcmp(node.Value, "true") == 0;
+                ret.Details.IsAccessTierInferred = node.Value == "true";
               }
               else if (
                   path.size() == 2 && path[0] == XmlTagName::k_Properties
@@ -6006,7 +5998,7 @@ namespace Azure { namespace Storage { namespace Blobs {
                   path.size() == 2 && path[0] == XmlTagName::k_Properties
                   && path[1] == XmlTagName::k_ServerEncrypted)
               {
-                ret.Details.IsServerEncrypted = std::strcmp(node.Value, "true") == 0;
+                ret.Details.IsServerEncrypted = node.Value == "true";
               }
               else if (
                   path.size() == 2 && path[0] == XmlTagName::k_Properties
@@ -6018,7 +6010,7 @@ namespace Azure { namespace Storage { namespace Blobs {
                   path.size() == 2 && path[0] == XmlTagName::k_Properties
                   && path[1] == XmlTagName::k_Sealed)
               {
-                ret.Details.IsSealed = std::strcmp(node.Value, "true") == 0;
+                ret.Details.IsSealed = node.Value == "true";
               }
               else if (
                   path.size() == 2 && path[0] == XmlTagName::k_Properties
@@ -6064,23 +6056,23 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "Id") == 0)
+              if (node.Name == "Id")
               {
                 path.emplace_back(XmlTagName::k_Id);
               }
-              else if (std::strcmp(node.Name, "AccessPolicy") == 0)
+              else if (node.Name == "AccessPolicy")
               {
                 path.emplace_back(XmlTagName::k_AccessPolicy);
               }
-              else if (std::strcmp(node.Name, "Start") == 0)
+              else if (node.Name == "Start")
               {
                 path.emplace_back(XmlTagName::k_Start);
               }
-              else if (std::strcmp(node.Name, "Expiry") == 0)
+              else if (node.Name == "Expiry")
               {
                 path.emplace_back(XmlTagName::k_Expiry);
               }
-              else if (std::strcmp(node.Name, "Permission") == 0)
+              else if (node.Name == "Permission")
               {
                 path.emplace_back(XmlTagName::k_Permission);
               }
@@ -6200,7 +6192,7 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (depth == 1 && node.Type == _internal::XmlNodeType::Text)
             {
-              ret.emplace(std::move(key), std::string(node.Value));
+              ret.emplace(std::move(key), node.Value);
             }
           }
           return ret;
@@ -6224,33 +6216,28 @@ namespace Azure { namespace Storage { namespace Blobs {
         {
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "SignedIdentifier"});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Id"});
-          writer.Write(
-              _internal::XmlNode{_internal::XmlNodeType::Text, nullptr, options.Id.data()});
+          writer.Write(_internal::XmlNode{_internal::XmlNodeType::Text, std::string(), options.Id});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "AccessPolicy"});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Start"});
           writer.Write(_internal::XmlNode{
               _internal::XmlNodeType::Text,
-              nullptr,
-              options.StartsOn
-                  .ToString(
-                      Azure::DateTime::DateFormat::Rfc3339,
-                      Azure::DateTime::TimeFractionFormat::AllDigits)
-                  .data()});
+              std::string(),
+              options.StartsOn.ToString(
+                  Azure::DateTime::DateFormat::Rfc3339,
+                  Azure::DateTime::TimeFractionFormat::AllDigits)});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Expiry"});
           writer.Write(_internal::XmlNode{
               _internal::XmlNodeType::Text,
-              nullptr,
-              options.ExpiresOn
-                  .ToString(
-                      Azure::DateTime::DateFormat::Rfc3339,
-                      Azure::DateTime::TimeFractionFormat::AllDigits)
-                  .data()});
+              std::string(),
+              options.ExpiresOn.ToString(
+                  Azure::DateTime::DateFormat::Rfc3339,
+                  Azure::DateTime::TimeFractionFormat::AllDigits)});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Permission"});
-          writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, options.Permissions.data()});
+          writer.Write(
+              _internal::XmlNode{_internal::XmlNodeType::Text, std::string(), options.Permissions});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
@@ -8178,11 +8165,11 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "Tags") == 0)
+              if (node.Name == "Tags")
               {
                 path.emplace_back(XmlTagName::k_Tags);
               }
-              else if (std::strcmp(node.Name, "TagSet") == 0)
+              else if (node.Name == "TagSet")
               {
                 path.emplace_back(XmlTagName::k_TagSet);
               }
@@ -8221,11 +8208,11 @@ namespace Azure { namespace Storage { namespace Blobs {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
               ++depth;
-              if (strcmp(node.Name, "Key") == 0)
+              if (node.Name == "Key")
               {
                 is_key = true;
               }
-              else if (strcmp(node.Name, "Value") == 0)
+              else if (node.Name == "Value")
               {
                 is_value = true;
               }
@@ -8264,11 +8251,10 @@ namespace Azure { namespace Storage { namespace Blobs {
           {
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Tag"});
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Key"});
-            writer.Write(_internal::XmlNode{_internal::XmlNodeType::Text, nullptr, i.first.data()});
+            writer.Write(_internal::XmlNode{_internal::XmlNodeType::Text, std::string(), i.first});
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Value"});
-            writer.Write(
-                _internal::XmlNode{_internal::XmlNodeType::Text, nullptr, i.second.data()});
+            writer.Write(_internal::XmlNode{_internal::XmlNodeType::Text, std::string(), i.second});
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           }
@@ -9003,19 +8989,19 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "BlockList") == 0)
+              if (node.Name == "BlockList")
               {
                 path.emplace_back(XmlTagName::k_BlockList);
               }
-              else if (std::strcmp(node.Name, "CommittedBlocks") == 0)
+              else if (node.Name == "CommittedBlocks")
               {
                 path.emplace_back(XmlTagName::k_CommittedBlocks);
               }
-              else if (std::strcmp(node.Name, "Block") == 0)
+              else if (node.Name == "Block")
               {
                 path.emplace_back(XmlTagName::k_Block);
               }
-              else if (std::strcmp(node.Name, "UncommittedBlocks") == 0)
+              else if (node.Name == "UncommittedBlocks")
               {
                 path.emplace_back(XmlTagName::k_UncommittedBlocks);
               }
@@ -9074,11 +9060,11 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "Name") == 0)
+              if (node.Name == "Name")
               {
                 path.emplace_back(XmlTagName::k_Name);
               }
-              else if (std::strcmp(node.Name, "Size") == 0)
+              else if (node.Name == "Size")
               {
                 path.emplace_back(XmlTagName::k_Size);
               }
@@ -9109,8 +9095,8 @@ namespace Azure { namespace Storage { namespace Blobs {
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "BlockList"});
           for (const auto& i : options.BlockList)
           {
-            writer.Write(_internal::XmlNode{
-                _internal::XmlNodeType::StartTag, i.first.ToString().data(), i.second.data()});
+            writer.Write(
+                _internal::XmlNode{_internal::XmlNodeType::StartTag, i.first.ToString(), i.second});
           }
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
         }
@@ -10114,15 +10100,15 @@ namespace Azure { namespace Storage { namespace Blobs {
             }
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
-              if (std::strcmp(node.Name, "PageList") == 0)
+              if (node.Name == "PageList")
               {
                 path.emplace_back(XmlTagName::k_PageList);
               }
-              else if (std::strcmp(node.Name, "PageRange") == 0)
+              else if (node.Name == "PageRange")
               {
                 path.emplace_back(XmlTagName::k_PageRange);
               }
-              else if (std::strcmp(node.Name, "ClearRange") == 0)
+              else if (node.Name == "ClearRange")
               {
                 path.emplace_back(XmlTagName::k_ClearRange);
               }
@@ -10165,13 +10151,12 @@ namespace Azure { namespace Storage { namespace Blobs {
             {
               break;
             }
-            else if (
-                node.Type == _internal::XmlNodeType::StartTag && strcmp(node.Name, "Start") == 0)
+            else if (node.Type == _internal::XmlNodeType::StartTag && node.Name == "Start")
             {
               ++depth;
               is_start = true;
             }
-            else if (node.Type == _internal::XmlNodeType::StartTag && strcmp(node.Name, "End") == 0)
+            else if (node.Type == _internal::XmlNodeType::StartTag && node.Name == "End")
             {
               ++depth;
               is_end = true;
@@ -10217,13 +10202,12 @@ namespace Azure { namespace Storage { namespace Blobs {
             {
               break;
             }
-            else if (
-                node.Type == _internal::XmlNodeType::StartTag && strcmp(node.Name, "Start") == 0)
+            else if (node.Type == _internal::XmlNodeType::StartTag && node.Name == "Start")
             {
               ++depth;
               is_start = true;
             }
-            else if (node.Type == _internal::XmlNodeType::StartTag && strcmp(node.Name, "End") == 0)
+            else if (node.Type == _internal::XmlNodeType::StartTag && node.Name == "End")
             {
               ++depth;
               is_end = true;
diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/xml_wrapper.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/xml_wrapper.hpp
index 8b756313e..85cf1ba71 100644
--- a/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/xml_wrapper.hpp
+++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/internal/xml_wrapper.hpp
@@ -20,13 +20,17 @@ namespace Azure { namespace Storage { namespace _internal {
 
   struct XmlNode final
   {
-    explicit XmlNode(XmlNodeType type, const char* name = nullptr, const char* value = nullptr)
-        : Type(type), Name(name), Value(value)
+    explicit XmlNode(
+        XmlNodeType type,
+        std::string name = std::string(),
+        std::string value = std::string())
+        : Type(type), Name(std::move(name)), Value(std::move(value))
     {
     }
+
     XmlNodeType Type;
-    const char* Name;
-    const char* Value;
+    std::string Name;
+    std::string Value;
   };
 
   class XmlReader final {
diff --git a/sdk/storage/azure-storage-common/src/storage_exception.cpp b/sdk/storage/azure-storage-common/src/storage_exception.cpp
index cda36383a..d1f43129c 100644
--- a/sdk/storage/azure-storage-common/src/storage_exception.cpp
+++ b/sdk/storage/azure-storage-common/src/storage_exception.cpp
@@ -77,15 +77,15 @@ namespace Azure { namespace Storage {
           else if (node.Type == _internal::XmlNodeType::StartTag)
           {
             startTagName = node.Name;
-            if (std::strcmp(node.Name, "Error") == 0)
+            if (node.Name == "Error")
             {
               path.emplace_back(XmlTagName::XmlTagError);
             }
-            else if (std::strcmp(node.Name, "Code") == 0)
+            else if (node.Name == "Code")
             {
               path.emplace_back(XmlTagName::XmlTagCode);
             }
-            else if (std::strcmp(node.Name, "Message") == 0)
+            else if (node.Name == "Message")
             {
               path.emplace_back(XmlTagName::XmlTagMessage);
             }
diff --git a/sdk/storage/azure-storage-common/src/xml_wrapper.cpp b/sdk/storage/azure-storage-common/src/xml_wrapper.cpp
index d6e8fd3a1..213b6c1d6 100644
--- a/sdk/storage/azure-storage-common/src/xml_wrapper.cpp
+++ b/sdk/storage/azure-storage-common/src/xml_wrapper.cpp
@@ -45,8 +45,8 @@ namespace Azure { namespace Storage { namespace _internal {
       int ret = xmlTextReaderMoveToNextAttribute(reader);
       if (ret == 1)
       {
-        const char* name = reinterpret_cast<const char*>(xmlTextReaderName(reader));
-        const char* value = reinterpret_cast<const char*>(xmlTextReaderValue(reader));
+        const char* name = reinterpret_cast<const char*>(xmlTextReaderConstName(reader));
+        const char* value = reinterpret_cast<const char*>(xmlTextReaderConstValue(reader));
         return XmlNode{XmlNodeType::Attribute, name, value};
       }
       else if (ret == 0)
@@ -74,8 +74,8 @@ namespace Azure { namespace Storage { namespace _internal {
     bool has_value = xmlTextReaderHasValue(reader) == 1;
     bool has_attributes = xmlTextReaderHasAttributes(reader) == 1;
 
-    const char* name = reinterpret_cast<const char*>(xmlTextReaderName(reader));
-    const char* value = reinterpret_cast<const char*>(xmlTextReaderValue(reader));
+    const char* name = reinterpret_cast<const char*>(xmlTextReaderConstName(reader));
+    const char* value = reinterpret_cast<const char*>(xmlTextReaderConstValue(reader));
 
     if (has_attributes)
     {
@@ -98,7 +98,7 @@ namespace Azure { namespace Storage { namespace _internal {
     {
       if (has_value)
       {
-        return XmlNode{XmlNodeType::Text, nullptr, value};
+        return XmlNode{XmlNodeType::Text, std::string(), value};
       }
     }
     else if (type == XML_READER_TYPE_SIGNIFICANT_WHITESPACE)
@@ -139,13 +139,13 @@ namespace Azure { namespace Storage { namespace _internal {
     xmlTextWriterPtr writer = static_cast<xmlTextWriterPtr>(m_writer);
     if (node.Type == XmlNodeType::StartTag)
     {
-      if (!node.Value)
+      if (node.Value.empty())
       {
-        xmlTextWriterStartElement(writer, BadCast(node.Name));
+        xmlTextWriterStartElement(writer, BadCast(node.Name.data()));
       }
       else
       {
-        xmlTextWriterWriteElement(writer, BadCast(node.Name), BadCast(node.Value));
+        xmlTextWriterWriteElement(writer, BadCast(node.Name.data()), BadCast(node.Value.data()));
       }
     }
     else if (node.Type == XmlNodeType::EndTag)
@@ -154,16 +154,16 @@ namespace Azure { namespace Storage { namespace _internal {
     }
     else if (node.Type == XmlNodeType::SelfClosingTag)
     {
-      xmlTextWriterStartElement(writer, BadCast(node.Name));
+      xmlTextWriterStartElement(writer, BadCast(node.Name.data()));
       xmlTextWriterEndElement(writer);
     }
     else if (node.Type == XmlNodeType::Text)
     {
-      xmlTextWriterWriteString(writer, BadCast(node.Value));
+      xmlTextWriterWriteString(writer, BadCast(node.Value.data()));
     }
     else if (node.Type == XmlNodeType::Attribute)
     {
-      xmlTextWriterWriteAttribute(writer, BadCast(node.Name), BadCast(node.Value));
+      xmlTextWriterWriteAttribute(writer, BadCast(node.Name.data()), BadCast(node.Value.data()));
     }
     else if (node.Type == XmlNodeType::End)
     {
diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp
index 1ad87ede3..aa5cd7b22 100644
--- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp
+++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/protocol/share_rest_client.hpp
@@ -2275,12 +2275,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
           {
             break;
           }
-          else if (node.Type == _internal::XmlNodeType::StartTag && strcmp(node.Name, "Start") == 0)
+          else if (
+              node.Type == _internal::XmlNodeType::StartTag
+              && strcmp(node.Name.data(), "Start") == 0)
           {
             ++depth;
             is_start = true;
           }
-          else if (node.Type == _internal::XmlNodeType::StartTag && strcmp(node.Name, "End") == 0)
+          else if (
+              node.Type == _internal::XmlNodeType::StartTag && strcmp(node.Name.data(), "End") == 0)
           {
             ++depth;
             is_end = true;
@@ -2462,13 +2465,13 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
         {
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Enabled"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, object.Enabled ? "true" : "false"});
+              _internal::XmlNodeType::Text, std::string(), object.Enabled ? "true" : "false"});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           if (object.Days.HasValue())
           {
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Days"});
             writer.Write(_internal::XmlNode{
-                _internal::XmlNodeType::Text, nullptr, std::to_string(object.Days.Value()).data()});
+                _internal::XmlNodeType::Text, std::string(), std::to_string(object.Days.Value())});
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           }
         }
@@ -2477,18 +2480,18 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
         {
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Version"});
           writer.Write(
-              _internal::XmlNode{_internal::XmlNodeType::Text, nullptr, object.Version.data()});
+              _internal::XmlNode{_internal::XmlNodeType::Text, std::string(), object.Version});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Enabled"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, object.Enabled ? "true" : "false"});
+              _internal::XmlNodeType::Text, std::string(), object.Enabled ? "true" : "false"});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           if (object.IncludeApis.HasValue())
           {
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "IncludeAPIs"});
             writer.Write(_internal::XmlNode{
                 _internal::XmlNodeType::Text,
-                nullptr,
+                std::string(),
                 object.IncludeApis.Value() ? "true" : "false"});
             writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           }
@@ -2502,25 +2505,23 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "CorsRule"});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "AllowedOrigins"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, object.AllowedOrigins.data()});
+              _internal::XmlNodeType::Text, std::string(), object.AllowedOrigins});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "AllowedMethods"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, object.AllowedMethods.data()});
+              _internal::XmlNodeType::Text, std::string(), object.AllowedMethods});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "AllowedHeaders"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, object.AllowedHeaders.data()});
+              _internal::XmlNodeType::Text, std::string(), object.AllowedHeaders});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "ExposedHeaders"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, object.ExposedHeaders.data()});
+              _internal::XmlNodeType::Text, std::string(), object.ExposedHeaders});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "MaxAgeInSeconds"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text,
-              nullptr,
-              std::to_string(object.MaxAgeInSeconds).data()});
+              _internal::XmlNodeType::Text, std::string(), std::to_string(object.MaxAgeInSeconds)});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
         }
@@ -2532,7 +2533,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Multichannel"});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Enabled"});
           writer.Write(_internal::XmlNode{
-              _internal::XmlNodeType::Text, nullptr, object.Enabled ? "true" : "false"});
+              _internal::XmlNodeType::Text, std::string(), object.Enabled ? "true" : "false"});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
         }
@@ -2637,11 +2638,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "Days") == 0)
+              if (std::strcmp(node.Name.data(), "Days") == 0)
               {
                 path.emplace_back(XmlTagName::Days);
               }
-              else if (std::strcmp(node.Name, "Enabled") == 0)
+              else if (std::strcmp(node.Name.data(), "Enabled") == 0)
               {
                 path.emplace_back(XmlTagName::Enabled);
               }
@@ -2658,7 +2659,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
               }
               else if (path.size() == 1 && path[0] == XmlTagName::Enabled)
               {
-                result.Enabled = (std::strcmp(node.Value, "true") == 0);
+                result.Enabled = (std::strcmp(node.Value.data(), "true") == 0);
               }
             }
           }
@@ -2699,19 +2700,19 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "Enabled") == 0)
+              if (std::strcmp(node.Name.data(), "Enabled") == 0)
               {
                 path.emplace_back(XmlTagName::Enabled);
               }
-              else if (std::strcmp(node.Name, "IncludeAPIs") == 0)
+              else if (std::strcmp(node.Name.data(), "IncludeAPIs") == 0)
               {
                 path.emplace_back(XmlTagName::IncludeAPIs);
               }
-              else if (std::strcmp(node.Name, "RetentionPolicy") == 0)
+              else if (std::strcmp(node.Name.data(), "RetentionPolicy") == 0)
               {
                 path.emplace_back(XmlTagName::RetentionPolicy);
               }
-              else if (std::strcmp(node.Name, "Version") == 0)
+              else if (std::strcmp(node.Name.data(), "Version") == 0)
               {
                 path.emplace_back(XmlTagName::Version);
               }
@@ -2730,11 +2731,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             {
               if (path.size() == 1 && path[0] == XmlTagName::Enabled)
               {
-                result.Enabled = (std::strcmp(node.Value, "true") == 0);
+                result.Enabled = (std::strcmp(node.Value.data(), "true") == 0);
               }
               else if (path.size() == 1 && path[0] == XmlTagName::IncludeAPIs)
               {
-                result.IncludeApis = (std::strcmp(node.Value, "true") == 0);
+                result.IncludeApis = (std::strcmp(node.Value.data(), "true") == 0);
               }
               else if (path.size() == 1 && path[0] == XmlTagName::Version)
               {
@@ -2780,23 +2781,23 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "AllowedHeaders") == 0)
+              if (std::strcmp(node.Name.data(), "AllowedHeaders") == 0)
               {
                 path.emplace_back(XmlTagName::AllowedHeaders);
               }
-              else if (std::strcmp(node.Name, "AllowedMethods") == 0)
+              else if (std::strcmp(node.Name.data(), "AllowedMethods") == 0)
               {
                 path.emplace_back(XmlTagName::AllowedMethods);
               }
-              else if (std::strcmp(node.Name, "AllowedOrigins") == 0)
+              else if (std::strcmp(node.Name.data(), "AllowedOrigins") == 0)
               {
                 path.emplace_back(XmlTagName::AllowedOrigins);
               }
-              else if (std::strcmp(node.Name, "ExposedHeaders") == 0)
+              else if (std::strcmp(node.Name.data(), "ExposedHeaders") == 0)
               {
                 path.emplace_back(XmlTagName::ExposedHeaders);
               }
-              else if (std::strcmp(node.Name, "MaxAgeInSeconds") == 0)
+              else if (std::strcmp(node.Name.data(), "MaxAgeInSeconds") == 0)
               {
                 path.emplace_back(XmlTagName::MaxAgeInSeconds);
               }
@@ -2863,7 +2864,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "Enabled") == 0)
+              if (std::strcmp(node.Name.data(), "Enabled") == 0)
               {
                 path.emplace_back(XmlTagName::Enabled);
               }
@@ -2876,7 +2877,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             {
               if (path.size() == 1 && path[0] == XmlTagName::Enabled)
               {
-                result.Enabled = (std::strcmp(node.Value, "true") == 0);
+                result.Enabled = (std::strcmp(node.Value.data(), "true") == 0);
               }
             }
           }
@@ -2914,7 +2915,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "Multichannel") == 0)
+              if (std::strcmp(node.Name.data(), "Multichannel") == 0)
               {
                 path.emplace_back(XmlTagName::Multichannel);
               }
@@ -2967,7 +2968,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "SMB") == 0)
+              if (std::strcmp(node.Name.data(), "SMB") == 0)
               {
                 path.emplace_back(XmlTagName::SMB);
               }
@@ -3025,27 +3026,27 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "Cors") == 0)
+              if (std::strcmp(node.Name.data(), "Cors") == 0)
               {
                 path.emplace_back(XmlTagName::Cors);
               }
-              else if (std::strcmp(node.Name, "CorsRule") == 0)
+              else if (std::strcmp(node.Name.data(), "CorsRule") == 0)
               {
                 path.emplace_back(XmlTagName::CorsRule);
               }
-              else if (std::strcmp(node.Name, "HourMetrics") == 0)
+              else if (std::strcmp(node.Name.data(), "HourMetrics") == 0)
               {
                 path.emplace_back(XmlTagName::HourMetrics);
               }
-              else if (std::strcmp(node.Name, "MinuteMetrics") == 0)
+              else if (std::strcmp(node.Name.data(), "MinuteMetrics") == 0)
               {
                 path.emplace_back(XmlTagName::MinuteMetrics);
               }
-              else if (std::strcmp(node.Name, "ProtocolSettings") == 0)
+              else if (std::strcmp(node.Name.data(), "ProtocolSettings") == 0)
               {
                 path.emplace_back(XmlTagName::ProtocolSettings);
               }
-              else if (std::strcmp(node.Name, "StorageServiceProperties") == 0)
+              else if (std::strcmp(node.Name.data(), "StorageServiceProperties") == 0)
               {
                 path.emplace_back(XmlTagName::StorageServiceProperties);
               }
@@ -3156,7 +3157,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "LeaseStatus") == 0)
+              if (std::strcmp(node.Name.data(), "LeaseStatus") == 0)
               {
                 path.emplace_back(XmlTagName::LeaseStatus);
               }
@@ -3207,7 +3208,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "LeaseState") == 0)
+              if (std::strcmp(node.Name.data(), "LeaseState") == 0)
               {
                 path.emplace_back(XmlTagName::LeaseState);
               }
@@ -3258,7 +3259,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "LeaseDuration") == 0)
+              if (std::strcmp(node.Name.data(), "LeaseDuration") == 0)
               {
                 path.emplace_back(XmlTagName::LeaseDuration);
               }
@@ -3323,63 +3324,63 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "AccessTier") == 0)
+              if (std::strcmp(node.Name.data(), "AccessTier") == 0)
               {
                 path.emplace_back(XmlTagName::AccessTier);
               }
-              else if (std::strcmp(node.Name, "AccessTierChangeTime") == 0)
+              else if (std::strcmp(node.Name.data(), "AccessTierChangeTime") == 0)
               {
                 path.emplace_back(XmlTagName::AccessTierChangeTime);
               }
-              else if (std::strcmp(node.Name, "AccessTierTransitionState") == 0)
+              else if (std::strcmp(node.Name.data(), "AccessTierTransitionState") == 0)
               {
                 path.emplace_back(XmlTagName::AccessTierTransitionState);
               }
-              else if (std::strcmp(node.Name, "DeletedTime") == 0)
+              else if (std::strcmp(node.Name.data(), "DeletedTime") == 0)
               {
                 path.emplace_back(XmlTagName::DeletedTime);
               }
-              else if (std::strcmp(node.Name, "Etag") == 0)
+              else if (std::strcmp(node.Name.data(), "Etag") == 0)
               {
                 path.emplace_back(XmlTagName::Etag);
               }
-              else if (std::strcmp(node.Name, "Last-Modified") == 0)
+              else if (std::strcmp(node.Name.data(), "Last-Modified") == 0)
               {
                 path.emplace_back(XmlTagName::LastModified);
               }
-              else if (std::strcmp(node.Name, "LeaseDuration") == 0)
+              else if (std::strcmp(node.Name.data(), "LeaseDuration") == 0)
               {
                 path.emplace_back(XmlTagName::LeaseDuration);
               }
-              else if (std::strcmp(node.Name, "LeaseState") == 0)
+              else if (std::strcmp(node.Name.data(), "LeaseState") == 0)
               {
                 path.emplace_back(XmlTagName::LeaseState);
               }
-              else if (std::strcmp(node.Name, "LeaseStatus") == 0)
+              else if (std::strcmp(node.Name.data(), "LeaseStatus") == 0)
               {
                 path.emplace_back(XmlTagName::LeaseStatus);
               }
-              else if (std::strcmp(node.Name, "NextAllowedQuotaDowngradeTime") == 0)
+              else if (std::strcmp(node.Name.data(), "NextAllowedQuotaDowngradeTime") == 0)
               {
                 path.emplace_back(XmlTagName::NextAllowedQuotaDowngradeTime);
               }
-              else if (std::strcmp(node.Name, "ProvisionedEgressMBps") == 0)
+              else if (std::strcmp(node.Name.data(), "ProvisionedEgressMBps") == 0)
               {
                 path.emplace_back(XmlTagName::ProvisionedEgressMBps);
               }
-              else if (std::strcmp(node.Name, "ProvisionedIngressMBps") == 0)
+              else if (std::strcmp(node.Name.data(), "ProvisionedIngressMBps") == 0)
               {
                 path.emplace_back(XmlTagName::ProvisionedIngressMBps);
               }
-              else if (std::strcmp(node.Name, "ProvisionedIops") == 0)
+              else if (std::strcmp(node.Name.data(), "ProvisionedIops") == 0)
               {
                 path.emplace_back(XmlTagName::ProvisionedIops);
               }
-              else if (std::strcmp(node.Name, "Quota") == 0)
+              else if (std::strcmp(node.Name.data(), "Quota") == 0)
               {
                 path.emplace_back(XmlTagName::Quota);
               }
-              else if (std::strcmp(node.Name, "RemainingRetentionDays") == 0)
+              else if (std::strcmp(node.Name.data(), "RemainingRetentionDays") == 0)
               {
                 path.emplace_back(XmlTagName::RemainingRetentionDays);
               }
@@ -3489,7 +3490,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             }
             else if (depth == 1 && node.Type == _internal::XmlNodeType::Text)
             {
-              result.emplace(std::move(key), std::string(node.Value));
+              result.emplace(std::move(key), node.Value);
             }
           }
           return result;
@@ -3531,27 +3532,27 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "Deleted") == 0)
+              if (std::strcmp(node.Name.data(), "Deleted") == 0)
               {
                 path.emplace_back(XmlTagName::Deleted);
               }
-              else if (std::strcmp(node.Name, "Metadata") == 0)
+              else if (std::strcmp(node.Name.data(), "Metadata") == 0)
               {
                 path.emplace_back(XmlTagName::Metadata);
               }
-              else if (std::strcmp(node.Name, "Name") == 0)
+              else if (std::strcmp(node.Name.data(), "Name") == 0)
               {
                 path.emplace_back(XmlTagName::Name);
               }
-              else if (std::strcmp(node.Name, "Properties") == 0)
+              else if (std::strcmp(node.Name.data(), "Properties") == 0)
               {
                 path.emplace_back(XmlTagName::Properties);
               }
-              else if (std::strcmp(node.Name, "Snapshot") == 0)
+              else if (std::strcmp(node.Name.data(), "Snapshot") == 0)
               {
                 path.emplace_back(XmlTagName::Snapshot);
               }
-              else if (std::strcmp(node.Name, "Version") == 0)
+              else if (std::strcmp(node.Name.data(), "Version") == 0)
               {
                 path.emplace_back(XmlTagName::Version);
               }
@@ -3575,7 +3576,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             {
               if (path.size() == 1 && path[0] == XmlTagName::Deleted)
               {
-                result.Deleted = (std::strcmp(node.Value, "true") == 0);
+                result.Deleted = (std::strcmp(node.Value.data(), "true") == 0);
               }
               else if (path.size() == 1 && path[0] == XmlTagName::Name)
               {
@@ -3630,27 +3631,27 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "EnumerationResults") == 0)
+              if (std::strcmp(node.Name.data(), "EnumerationResults") == 0)
               {
                 path.emplace_back(XmlTagName::EnumerationResults);
               }
-              else if (std::strcmp(node.Name, "MaxResults") == 0)
+              else if (std::strcmp(node.Name.data(), "MaxResults") == 0)
               {
                 path.emplace_back(XmlTagName::MaxResults);
               }
-              else if (std::strcmp(node.Name, "NextMarker") == 0)
+              else if (std::strcmp(node.Name.data(), "NextMarker") == 0)
               {
                 path.emplace_back(XmlTagName::NextMarker);
               }
-              else if (std::strcmp(node.Name, "Prefix") == 0)
+              else if (std::strcmp(node.Name.data(), "Prefix") == 0)
               {
                 path.emplace_back(XmlTagName::Prefix);
               }
-              else if (std::strcmp(node.Name, "Share") == 0)
+              else if (std::strcmp(node.Name.data(), "Share") == 0)
               {
                 path.emplace_back(XmlTagName::Share);
               }
-              else if (std::strcmp(node.Name, "Shares") == 0)
+              else if (std::strcmp(node.Name.data(), "Shares") == 0)
               {
                 path.emplace_back(XmlTagName::Shares);
               }
@@ -3688,7 +3689,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::Attribute)
             {
               if (path.size() == 1 && path[0] == XmlTagName::EnumerationResults
-                  && (std::strcmp(node.Name, "ServiceEndpoint") == 0))
+                  && (std::strcmp(node.Name.data(), "ServiceEndpoint") == 0))
               {
                 result.ServiceEndpoint = node.Value;
               }
@@ -4813,15 +4814,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "Expiry") == 0)
+              if (std::strcmp(node.Name.data(), "Expiry") == 0)
               {
                 path.emplace_back(XmlTagName::Expiry);
               }
-              else if (std::strcmp(node.Name, "Permission") == 0)
+              else if (std::strcmp(node.Name.data(), "Permission") == 0)
               {
                 path.emplace_back(XmlTagName::Permission);
               }
-              else if (std::strcmp(node.Name, "Start") == 0)
+              else if (std::strcmp(node.Name.data(), "Start") == 0)
               {
                 path.emplace_back(XmlTagName::Start);
               }
@@ -4881,11 +4882,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "AccessPolicy") == 0)
+              if (std::strcmp(node.Name.data(), "AccessPolicy") == 0)
               {
                 path.emplace_back(XmlTagName::AccessPolicy);
               }
-              else if (std::strcmp(node.Name, "Id") == 0)
+              else if (std::strcmp(node.Name.data(), "Id") == 0)
               {
                 path.emplace_back(XmlTagName::Id);
               }
@@ -4943,11 +4944,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "SignedIdentifier") == 0)
+              if (std::strcmp(node.Name.data(), "SignedIdentifier") == 0)
               {
                 path.emplace_back(XmlTagName::SignedIdentifier);
               }
-              else if (std::strcmp(node.Name, "SignedIdentifiers") == 0)
+              else if (std::strcmp(node.Name.data(), "SignedIdentifiers") == 0)
               {
                 path.emplace_back(XmlTagName::SignedIdentifiers);
               }
@@ -5007,24 +5008,20 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Start"});
           writer.Write(_internal::XmlNode{
               _internal::XmlNodeType::Text,
-              nullptr,
-              object.StartsOn
-                  .ToString(
-                      Azure::DateTime::DateFormat::Rfc3339, DateTime::TimeFractionFormat::AllDigits)
-                  .data()});
+              std::string(),
+              object.StartsOn.ToString(
+                  Azure::DateTime::DateFormat::Rfc3339, DateTime::TimeFractionFormat::AllDigits)});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Expiry"});
           writer.Write(_internal::XmlNode{
               _internal::XmlNodeType::Text,
-              nullptr,
-              object.ExpiresOn
-                  .ToString(
-                      Azure::DateTime::DateFormat::Rfc3339, DateTime::TimeFractionFormat::AllDigits)
-                  .data()});
+              std::string(),
+              object.ExpiresOn.ToString(
+                  Azure::DateTime::DateFormat::Rfc3339, DateTime::TimeFractionFormat::AllDigits)});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Permission"});
           writer.Write(
-              _internal::XmlNode{_internal::XmlNodeType::Text, nullptr, object.Permission.data()});
+              _internal::XmlNode{_internal::XmlNodeType::Text, std::string(), object.Permission});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
         }
@@ -5035,7 +5032,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
         {
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "SignedIdentifier"});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::StartTag, "Id"});
-          writer.Write(_internal::XmlNode{_internal::XmlNodeType::Text, nullptr, object.Id.data()});
+          writer.Write(_internal::XmlNode{_internal::XmlNodeType::Text, std::string(), object.Id});
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
           AccessPolicyToXml(writer, object.Policy);
           writer.Write(_internal::XmlNode{_internal::XmlNodeType::EndTag});
@@ -5112,11 +5109,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "ShareStats") == 0)
+              if (std::strcmp(node.Name.data(), "ShareStats") == 0)
               {
                 path.emplace_back(XmlTagName::ShareStats);
               }
-              else if (std::strcmp(node.Name, "ShareUsageBytes") == 0)
+              else if (std::strcmp(node.Name.data(), "ShareUsageBytes") == 0)
               {
                 path.emplace_back(XmlTagName::ShareUsageBytes);
               }
@@ -5741,7 +5738,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "Name") == 0)
+              if (std::strcmp(node.Name.data(), "Name") == 0)
               {
                 path.emplace_back(XmlTagName::Name);
               }
@@ -5792,7 +5789,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "Content-Length") == 0)
+              if (std::strcmp(node.Name.data(), "Content-Length") == 0)
               {
                 path.emplace_back(XmlTagName::ContentLength);
               }
@@ -5844,11 +5841,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "Name") == 0)
+              if (std::strcmp(node.Name.data(), "Name") == 0)
               {
                 path.emplace_back(XmlTagName::Name);
               }
-              else if (std::strcmp(node.Name, "Properties") == 0)
+              else if (std::strcmp(node.Name.data(), "Properties") == 0)
               {
                 path.emplace_back(XmlTagName::Properties);
               }
@@ -5907,11 +5904,11 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "Directory") == 0)
+              if (std::strcmp(node.Name.data(), "Directory") == 0)
               {
                 path.emplace_back(XmlTagName::Directory);
               }
-              else if (std::strcmp(node.Name, "File") == 0)
+              else if (std::strcmp(node.Name.data(), "File") == 0)
               {
                 path.emplace_back(XmlTagName::File);
               }
@@ -5973,23 +5970,23 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "Entries") == 0)
+              if (std::strcmp(node.Name.data(), "Entries") == 0)
               {
                 path.emplace_back(XmlTagName::Entries);
               }
-              else if (std::strcmp(node.Name, "EnumerationResults") == 0)
+              else if (std::strcmp(node.Name.data(), "EnumerationResults") == 0)
               {
                 path.emplace_back(XmlTagName::EnumerationResults);
               }
-              else if (std::strcmp(node.Name, "MaxResults") == 0)
+              else if (std::strcmp(node.Name.data(), "MaxResults") == 0)
               {
                 path.emplace_back(XmlTagName::MaxResults);
               }
-              else if (std::strcmp(node.Name, "NextMarker") == 0)
+              else if (std::strcmp(node.Name.data(), "NextMarker") == 0)
               {
                 path.emplace_back(XmlTagName::NextMarker);
               }
-              else if (std::strcmp(node.Name, "Prefix") == 0)
+              else if (std::strcmp(node.Name.data(), "Prefix") == 0)
               {
                 path.emplace_back(XmlTagName::Prefix);
               }
@@ -6028,25 +6025,25 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::Attribute)
             {
               if (path.size() == 1 && path[0] == XmlTagName::EnumerationResults
-                  && (std::strcmp(node.Name, "DirectoryPath") == 0))
+                  && (std::strcmp(node.Name.data(), "DirectoryPath") == 0))
               {
                 result.DirectoryPath = node.Value;
               }
               else if (
                   path.size() == 1 && path[0] == XmlTagName::EnumerationResults
-                  && (std::strcmp(node.Name, "ServiceEndpoint") == 0))
+                  && (std::strcmp(node.Name.data(), "ServiceEndpoint") == 0))
               {
                 result.ServiceEndpoint = node.Value;
               }
               else if (
                   path.size() == 1 && path[0] == XmlTagName::EnumerationResults
-                  && (std::strcmp(node.Name, "ShareName") == 0))
+                  && (std::strcmp(node.Name.data(), "ShareName") == 0))
               {
                 result.ShareName = node.Value;
               }
               else if (
                   path.size() == 1 && path[0] == XmlTagName::EnumerationResults
-                  && (std::strcmp(node.Name, "ShareSnapshot") == 0))
+                  && (std::strcmp(node.Name.data(), "ShareSnapshot") == 0))
               {
                 result.ShareSnapshot = node.Value;
               }
@@ -6135,35 +6132,35 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "ClientIp") == 0)
+              if (std::strcmp(node.Name.data(), "ClientIp") == 0)
               {
                 path.emplace_back(XmlTagName::ClientIp);
               }
-              else if (std::strcmp(node.Name, "FileId") == 0)
+              else if (std::strcmp(node.Name.data(), "FileId") == 0)
               {
                 path.emplace_back(XmlTagName::FileId);
               }
-              else if (std::strcmp(node.Name, "HandleId") == 0)
+              else if (std::strcmp(node.Name.data(), "HandleId") == 0)
               {
                 path.emplace_back(XmlTagName::HandleId);
               }
-              else if (std::strcmp(node.Name, "LastReconnectTime") == 0)
+              else if (std::strcmp(node.Name.data(), "LastReconnectTime") == 0)
               {
                 path.emplace_back(XmlTagName::LastReconnectTime);
               }
-              else if (std::strcmp(node.Name, "OpenTime") == 0)
+              else if (std::strcmp(node.Name.data(), "OpenTime") == 0)
               {
                 path.emplace_back(XmlTagName::OpenTime);
               }
-              else if (std::strcmp(node.Name, "ParentId") == 0)
+              else if (std::strcmp(node.Name.data(), "ParentId") == 0)
               {
                 path.emplace_back(XmlTagName::ParentId);
               }
-              else if (std::strcmp(node.Name, "Path") == 0)
+              else if (std::strcmp(node.Name.data(), "Path") == 0)
               {
                 path.emplace_back(XmlTagName::Path);
               }
-              else if (std::strcmp(node.Name, "SessionId") == 0)
+              else if (std::strcmp(node.Name.data(), "SessionId") == 0)
               {
                 path.emplace_back(XmlTagName::SessionId);
               }
@@ -6246,19 +6243,19 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "Entries") == 0)
+              if (std::strcmp(node.Name.data(), "Entries") == 0)
               {
                 path.emplace_back(XmlTagName::Entries);
               }
-              else if (std::strcmp(node.Name, "EnumerationResults") == 0)
+              else if (std::strcmp(node.Name.data(), "EnumerationResults") == 0)
               {
                 path.emplace_back(XmlTagName::EnumerationResults);
               }
-              else if (std::strcmp(node.Name, "Handle") == 0)
+              else if (std::strcmp(node.Name.data(), "Handle") == 0)
               {
                 path.emplace_back(XmlTagName::Handle);
               }
-              else if (std::strcmp(node.Name, "NextMarker") == 0)
+              else if (std::strcmp(node.Name.data(), "NextMarker") == 0)
               {
                 path.emplace_back(XmlTagName::NextMarker);
               }
@@ -7975,15 +7972,15 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "ClearRange") == 0)
+              if (std::strcmp(node.Name.data(), "ClearRange") == 0)
               {
                 path.emplace_back(XmlTagName::ClearRange);
               }
-              else if (std::strcmp(node.Name, "Range") == 0)
+              else if (std::strcmp(node.Name.data(), "Range") == 0)
               {
                 path.emplace_back(XmlTagName::Range);
               }
-              else if (std::strcmp(node.Name, "Ranges") == 0)
+              else if (std::strcmp(node.Name.data(), "Ranges") == 0)
               {
                 path.emplace_back(XmlTagName::Ranges);
               }
@@ -8132,35 +8129,35 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "ClientIp") == 0)
+              if (std::strcmp(node.Name.data(), "ClientIp") == 0)
               {
                 path.emplace_back(XmlTagName::ClientIp);
               }
-              else if (std::strcmp(node.Name, "FileId") == 0)
+              else if (std::strcmp(node.Name.data(), "FileId") == 0)
               {
                 path.emplace_back(XmlTagName::FileId);
               }
-              else if (std::strcmp(node.Name, "HandleId") == 0)
+              else if (std::strcmp(node.Name.data(), "HandleId") == 0)
               {
                 path.emplace_back(XmlTagName::HandleId);
               }
-              else if (std::strcmp(node.Name, "LastReconnectTime") == 0)
+              else if (std::strcmp(node.Name.data(), "LastReconnectTime") == 0)
               {
                 path.emplace_back(XmlTagName::LastReconnectTime);
               }
-              else if (std::strcmp(node.Name, "OpenTime") == 0)
+              else if (std::strcmp(node.Name.data(), "OpenTime") == 0)
               {
                 path.emplace_back(XmlTagName::OpenTime);
               }
-              else if (std::strcmp(node.Name, "ParentId") == 0)
+              else if (std::strcmp(node.Name.data(), "ParentId") == 0)
               {
                 path.emplace_back(XmlTagName::ParentId);
               }
-              else if (std::strcmp(node.Name, "Path") == 0)
+              else if (std::strcmp(node.Name.data(), "Path") == 0)
               {
                 path.emplace_back(XmlTagName::Path);
               }
-              else if (std::strcmp(node.Name, "SessionId") == 0)
+              else if (std::strcmp(node.Name.data(), "SessionId") == 0)
               {
                 path.emplace_back(XmlTagName::SessionId);
               }
@@ -8243,19 +8240,19 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
             else if (node.Type == _internal::XmlNodeType::StartTag)
             {
 
-              if (std::strcmp(node.Name, "Entries") == 0)
+              if (std::strcmp(node.Name.data(), "Entries") == 0)
               {
                 path.emplace_back(XmlTagName::Entries);
               }
-              else if (std::strcmp(node.Name, "EnumerationResults") == 0)
+              else if (std::strcmp(node.Name.data(), "EnumerationResults") == 0)
               {
                 path.emplace_back(XmlTagName::EnumerationResults);
               }
-              else if (std::strcmp(node.Name, "Handle") == 0)
+              else if (std::strcmp(node.Name.data(), "Handle") == 0)
               {
                 path.emplace_back(XmlTagName::Handle);
               }
-              else if (std::strcmp(node.Name, "NextMarker") == 0)
+              else if (std::strcmp(node.Name.data(), "NextMarker") == 0)
               {
                 path.emplace_back(XmlTagName::NextMarker);
               }