diff --git a/sdk/core/azure-core/CHANGELOG.md b/sdk/core/azure-core/CHANGELOG.md
index 6dac8b251..1442ecd96 100644
--- a/sdk/core/azure-core/CHANGELOG.md
+++ b/sdk/core/azure-core/CHANGELOG.md
@@ -15,7 +15,7 @@
 - Renamed `NoRevoke` to `EnableCertificateRevocationListCheck` for `Azure::Core::Http::CurlTransportSSLOptions`.
 - Renamed `GetString()` to `ToString()` in `Azure::Core::DateTime`.
 - Renamed `GetUuidString()` to `ToString()` in `Azure::Core::Uuid`.
-- Moved `Version` from `Azure::Core::Details` to `Azure::Core`.
+- Renamed `Azure::Core::Details::Version` to `Azure::Core::PackageVersion`.
 - Moved `BodyStream` and its derived types from `Azure::Core::Http` namespace to `Azure::IO`, and moved the `body_stream.hpp` header from `azure/core/http` to `azure/core/io`.
 - Moved `NullBodyStream` to internal usage only. It is not meant for public use.
 - Removed `LimitBodyStream`.
diff --git a/sdk/core/azure-core/inc/azure/core/version.hpp b/sdk/core/azure-core/inc/azure/core/version.hpp
index b8bf05564..15fe5cbf1 100644
--- a/sdk/core/azure-core/inc/azure/core/version.hpp
+++ b/sdk/core/azure-core/inc/azure/core/version.hpp
@@ -22,7 +22,7 @@ namespace Azure { namespace Core {
   /**
    * @brief Provides version information.
    */
-  class Version {
+  class PackageVersion {
   public:
     /// Major numeric identifier.
     static constexpr int Major = AZURE_CORE_VERSION_MAJOR;
diff --git a/sdk/core/azure-core/src/version.cpp b/sdk/core/azure-core/src/version.cpp
index 89ea1305b..23e7eb60a 100644
--- a/sdk/core/azure-core/src/version.cpp
+++ b/sdk/core/azure-core/src/version.cpp
@@ -8,19 +8,19 @@
 
 using namespace Azure::Core;
 
-const std::string Version::PreRelease = secret;
+const std::string PackageVersion::PreRelease = secret;
 
-std::string Version::VersionString()
+std::string PackageVersion::VersionString()
 {
   static const std::string versionString = [] {
     std::string version;
     std::stringstream ss;
     std::string dot = ".";
 
-    ss << Version::Major << dot << Version::Minor << dot << Version::Patch;
+    ss << PackageVersion::Major << dot << PackageVersion::Minor << dot << PackageVersion::Patch;
 
-    if (!Version::PreRelease.empty())
-      ss << "-" << Version::PreRelease;
+    if (!PackageVersion::PreRelease.empty())
+      ss << "-" << PackageVersion::PreRelease;
 
     return ss.str();
   }();
diff --git a/sdk/core/azure-core/test/ut/simplified_header.cpp b/sdk/core/azure-core/test/ut/simplified_header.cpp
index 0434c8230..120799df7 100644
--- a/sdk/core/azure-core/test/ut/simplified_header.cpp
+++ b/sdk/core/azure-core/test/ut/simplified_header.cpp
@@ -44,7 +44,7 @@ TEST(SimplifiedHeader, core)
   EXPECT_NO_THROW(Azure::Core::Uuid::CreateUuid());
   EXPECT_NO_THROW(Azure::Core::RequestFailedException("foo"));
   EXPECT_NO_THROW(Azure::Core::OperationStatus("foo"));
-  EXPECT_NO_THROW(Azure::Core::Version::VersionString());
+  EXPECT_NO_THROW(Azure::Core::PackageVersion::VersionString());
 
   {
     std::vector<uint8_t> buffer(10);
diff --git a/sdk/identity/azure-identity/CHANGELOG.md b/sdk/identity/azure-identity/CHANGELOG.md
index 8b1be1655..dfca68f51 100644
--- a/sdk/identity/azure-identity/CHANGELOG.md
+++ b/sdk/identity/azure-identity/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Breaking Changes
 
 - Removed `TransportPolicyOptions` from `ClientSecretCredentialOptions`. Updated the options to derive from ClientOptions.
+- Renamed `Azure::Identity::Details::Version` to `Azure::Identity::PackageVersion`.
 
 ## 1.0.0-beta.3 (2021-02-02)
 
diff --git a/sdk/identity/azure-identity/inc/azure/identity/version.hpp b/sdk/identity/azure-identity/inc/azure/identity/version.hpp
index 7fe5c610c..2c0033acd 100644
--- a/sdk/identity/azure-identity/inc/azure/identity/version.hpp
+++ b/sdk/identity/azure-identity/inc/azure/identity/version.hpp
@@ -17,12 +17,12 @@
 #define AZURE_IDENTITY_VERSION_PATCH 0
 #define AZURE_IDENTITY_VERSION_PRERELEASE "beta.4"
 
-namespace Azure { namespace Identity { namespace _detail {
+namespace Azure { namespace Identity {
 
   /**
    * @brief Provides version information.
    */
-  class Version {
+  class PackageVersion {
   public:
     /// Major numeric identifier.
     static constexpr int Major = AZURE_IDENTITY_VERSION_MAJOR;
@@ -48,7 +48,7 @@ namespace Azure { namespace Identity { namespace _detail {
     static constexpr char const* secret = AZURE_IDENTITY_VERSION_PRERELEASE;
   };
 
-}}} // namespace Azure::Identity::_detail
+}} // namespace Azure::Identity
 
 #undef AZURE_IDENTITY_VERSION_MAJOR
 #undef AZURE_IDENTITY_VERSION_MINOR
diff --git a/sdk/identity/azure-identity/src/version.cpp b/sdk/identity/azure-identity/src/version.cpp
index 19e0b7258..65ac885c5 100644
--- a/sdk/identity/azure-identity/src/version.cpp
+++ b/sdk/identity/azure-identity/src/version.cpp
@@ -6,21 +6,21 @@
 #include <sstream>
 #include <string>
 
-using namespace Azure::Identity::_detail;
+using namespace Azure::Identity;
 
-std::string const Version::PreRelease = secret;
+std::string const PackageVersion::PreRelease = secret;
 
-std::string Version::VersionString()
+std::string PackageVersion::VersionString()
 {
   static const std::string versionString = [] {
     std::string version;
     std::stringstream ss;
     std::string dot = ".";
 
-    ss << Version::Major << dot << Version::Minor << dot << Version::Patch;
+    ss << PackageVersion::Major << dot << PackageVersion::Minor << dot << PackageVersion::Patch;
 
-    if (!Version::PreRelease.empty())
-      ss << "-" << Version::PreRelease;
+    if (!PackageVersion::PreRelease.empty())
+      ss << "-" << PackageVersion::PreRelease;
 
     return ss.str();
   }();
diff --git a/sdk/identity/azure-identity/test/ut/simplified_header.cpp b/sdk/identity/azure-identity/test/ut/simplified_header.cpp
index acab667b0..2378ad224 100644
--- a/sdk/identity/azure-identity/test/ut/simplified_header.cpp
+++ b/sdk/identity/azure-identity/test/ut/simplified_header.cpp
@@ -19,5 +19,5 @@ TEST(SimplifiedHeader, identity)
 {
   EXPECT_NO_THROW(Azure::Identity::ClientSecretCredential clientSecretCredential("", "", ""));
   EXPECT_NO_THROW(Azure::Identity::EnvironmentCredential environmentCredential);
-  EXPECT_NO_THROW(Azure::Identity::_detail::Version::VersionString());
+  EXPECT_NO_THROW(Azure::Identity::PackageVersion::VersionString());
 }
diff --git a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/version.hpp b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/version.hpp
index add6a827f..783052469 100644
--- a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/version.hpp
+++ b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/version.hpp
@@ -19,7 +19,7 @@
 
 namespace Azure { namespace Security { namespace KeyVault { namespace Common {
 
-  class Version {
+  class PackageVersion {
   public:
     static constexpr int Major = AZURE_SECURITY_KEYVAULT_COMMON_VERSION_MAJOR;
     static constexpr int Minor = AZURE_SECURITY_KEYVAULT_COMMON_VERSION_MINOR;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/version.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/version.hpp
index 34556fcb2..71111ee8d 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/version.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/version.hpp
@@ -19,7 +19,7 @@
 
 namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
 
-  class Version {
+  class PackageVersion {
   public:
     static constexpr int Major = AZURE_SECURITY_KEYVAULT_KEYS_VERSION_MAJOR;
     static constexpr int Minor = AZURE_SECURITY_KEYVAULT_KEYS_VERSION_MINOR;
diff --git a/sdk/storage/azure-storage-blobs/CHANGELOG.md b/sdk/storage/azure-storage-blobs/CHANGELOG.md
index ff19225da..25a9a2181 100644
--- a/sdk/storage/azure-storage-blobs/CHANGELOG.md
+++ b/sdk/storage/azure-storage-blobs/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Changed the return type of `StartCopyFromUri` and `StartCopyIncremental` API from a `Response<T>` to the particular `Operation<T>` type called `StartCopyBlobOperation` directly.
 - String conversion functions of extensible enums were renamed from `Get()` to `ToString()`.
 - Moved `SecondaryHostForRetryReads` out of retry options, now it's under `BlobClientOptions`.
+- Renamed `Azure::Storage::Blobs::Details::Version` to `Azure::Storage::Blobs::PackageVersion`.
 
 ### Other Changes and Improvements
 
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/version.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/version.hpp
index 75767751c..583d45403 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/version.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs/version.hpp
@@ -16,12 +16,12 @@
 #define AZURE_STORAGE_BLOBS_VERSION_PATCH 0
 #define AZURE_STORAGE_BLOBS_VERSION_PRERELEASE "beta.9"
 
-namespace Azure { namespace Storage { namespace Blobs { namespace _detail {
+namespace Azure { namespace Storage { namespace Blobs {
 
   /**
    * @brief Provides version information.
    */
-  struct Version
+  struct PackageVersion
   {
   public:
     /// Major numeric identifier.
@@ -53,7 +53,7 @@ namespace Azure { namespace Storage { namespace Blobs { namespace _detail {
     }
   };
 
-}}}} // namespace Azure::Storage::Blobs::_detail
+}}} // namespace Azure::Storage::Blobs
 
 #undef AZURE_STORAGE_BLOBS_VERSION_MAJOR
 #undef AZURE_STORAGE_BLOBS_VERSION_MINOR
diff --git a/sdk/storage/azure-storage-blobs/src/blob_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_client.cpp
index 64c877b95..fe2b2d2cd 100644
--- a/sdk/storage/azure-storage-blobs/src/blob_client.cpp
+++ b/sdk/storage/azure-storage-blobs/src/blob_client.cpp
@@ -66,7 +66,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         newOptions,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -99,7 +99,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -123,7 +123,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
diff --git a/sdk/storage/azure-storage-blobs/src/blob_container_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_container_client.cpp
index e3123a4e9..a90f90edf 100644
--- a/sdk/storage/azure-storage-blobs/src/blob_container_client.cpp
+++ b/sdk/storage/azure-storage-blobs/src/blob_container_client.cpp
@@ -62,7 +62,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         newOptions,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -95,7 +95,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -121,7 +121,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
diff --git a/sdk/storage/azure-storage-blobs/src/blob_service_client.cpp b/sdk/storage/azure-storage-blobs/src/blob_service_client.cpp
index f6abd7cf6..c8d333458 100644
--- a/sdk/storage/azure-storage-blobs/src/blob_service_client.cpp
+++ b/sdk/storage/azure-storage-blobs/src/blob_service_client.cpp
@@ -57,7 +57,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         newOptions,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -90,7 +90,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -116,7 +116,7 @@ namespace Azure { namespace Storage { namespace Blobs {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
diff --git a/sdk/storage/azure-storage-common/CHANGELOG.md b/sdk/storage/azure-storage-common/CHANGELOG.md
index 29f1f3a1a..cf6919e0f 100644
--- a/sdk/storage/azure-storage-common/CHANGELOG.md
+++ b/sdk/storage/azure-storage-common/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## 12.0.0-beta.9 (Unreleased)
 
+### Breaking Changes
+
+- Renamed `Azure::Storage::Common::Details::Version` to `Azure::Storage::Common::PackageVersion`.
 
 ## 12.0.0-beta.8 (2021-02-12)
 
diff --git a/sdk/storage/azure-storage-common/inc/azure/storage/common/version.hpp b/sdk/storage/azure-storage-common/inc/azure/storage/common/version.hpp
index bad6812c0..9ed0bc9a7 100644
--- a/sdk/storage/azure-storage-common/inc/azure/storage/common/version.hpp
+++ b/sdk/storage/azure-storage-common/inc/azure/storage/common/version.hpp
@@ -16,12 +16,12 @@
 #define AZURE_STORAGE_COMMON_VERSION_PATCH 0
 #define AZURE_STORAGE_COMMON_VERSION_PRERELEASE "beta.9"
 
-namespace Azure { namespace Storage { namespace Common { namespace _detail {
+namespace Azure { namespace Storage { namespace Common {
 
   /**
    * @brief Provides version information.
    */
-  struct Version
+  struct PackageVersion
   {
   public:
     /// Major numeric identifier.
@@ -53,7 +53,7 @@ namespace Azure { namespace Storage { namespace Common { namespace _detail {
     }
   };
 
-}}}} // namespace Azure::Storage::Common::_detail
+}}} // namespace Azure::Storage::Common
 
 #undef AZURE_STORAGE_COMMON_VERSION_MAJOR
 #undef AZURE_STORAGE_COMMON_VERSION_MINOR
diff --git a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md
index f8742f1b8..6813bdf9c 100644
--- a/sdk/storage/azure-storage-files-datalake/CHANGELOG.md
+++ b/sdk/storage/azure-storage-files-datalake/CHANGELOG.md
@@ -11,6 +11,7 @@
 - DataLake client constructors won't automatically convert blob url to dfs url anymore.
 - String conversion functions of extensible enums were renamed from `Get()` to `ToString()`.
 - Moved `SecondaryHostForRetryReads` out of retry options, now it's under `DataLakeClientOptions`.
+- Renamed `Azure::Storage::Files::DataLake::Details::Version` to `Azure::Storage::Files::DataLake::PackageVersion`.
 
 ## 12.0.0-beta.8 (2021-02-12)
 
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/version.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/version.hpp
index 8c1cb0eb7..87f7c9654 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/version.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake/version.hpp
@@ -16,12 +16,12 @@
 #define AZURE_STORAGE_FILES_DATALAKE_VERSION_PATCH 0
 #define AZURE_STORAGE_FILES_DATALAKE_VERSION_PRERELEASE "beta.9"
 
-namespace Azure { namespace Storage { namespace Files { namespace DataLake { namespace _detail {
+namespace Azure { namespace Storage { namespace Files { namespace DataLake {
 
   /**
    * @brief Provides version information.
    */
-  struct Version
+  struct PackageVersion
   {
   public:
     /// Major numeric identifier.
@@ -53,7 +53,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam
     }
   };
 
-}}}}} // namespace Azure::Storage::Files::DataLake::_detail
+}}}} // namespace Azure::Storage::Files::DataLake
 
 #undef AZURE_STORAGE_FILES_DATALAKE_VERSION_MAJOR
 #undef AZURE_STORAGE_FILES_DATALAKE_VERSION_MINOR
diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp
index ca83a5796..a01736fdc 100644
--- a/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp
+++ b/sdk/storage/azure-storage-files-datalake/src/datalake_file_system_client.cpp
@@ -69,7 +69,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         newOptions,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -105,7 +105,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -132,7 +132,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp
index 0459f3380..900ab448c 100644
--- a/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp
+++ b/sdk/storage/azure-storage-files-datalake/src/datalake_path_client.cpp
@@ -107,7 +107,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         newOptions,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -143,7 +143,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -169,7 +169,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
diff --git a/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp b/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp
index 6b9c86aab..49c9465b7 100644
--- a/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp
+++ b/sdk/storage/azure-storage-files-datalake/src/datalake_service_client.cpp
@@ -110,7 +110,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         newOptions,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -146,7 +146,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -173,7 +173,7 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
diff --git a/sdk/storage/azure-storage-files-shares/CHANGELOG.md b/sdk/storage/azure-storage-files-shares/CHANGELOG.md
index e999fe43e..b898f3073 100644
--- a/sdk/storage/azure-storage-files-shares/CHANGELOG.md
+++ b/sdk/storage/azure-storage-files-shares/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 - Changed the return type of `StartCopy` API from a `Response<T>` to the particular `Operation<T>` type called `StartCopyShareFileOperation` directly.
 - String conversion functions of extensible enums were renamed from `Get()` to `ToString()`.
+- Renamed `Azure::Storage::Files::Shares::Details::Version` to `Azure::Storage::Files::Shares::PackageVersion`.
 
 ## 12.0.0-beta.8 (2021-02-12)
 
diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/version.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/version.hpp
index c6a9767dd..e47198093 100644
--- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/version.hpp
+++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares/version.hpp
@@ -16,12 +16,12 @@
 #define AZURE_STORAGE_FILES_SHARES_VERSION_PATCH 0
 #define AZURE_STORAGE_FILES_SHARES_VERSION_PRERELEASE "beta.9"
 
-namespace Azure { namespace Storage { namespace Files { namespace Shares { namespace _detail {
+namespace Azure { namespace Storage { namespace Files { namespace Shares {
 
   /**
    * @brief Provides version information.
    */
-  struct Version
+  struct PackageVersion
   {
   public:
     /// Major numeric identifier.
@@ -53,7 +53,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { names
     }
   };
 
-}}}}} // namespace Azure::Storage::Files::Shares::_detail
+}}}} // namespace Azure::Storage::Files::Shares
 
 #undef AZURE_STORAGE_FILES_SHARES_VERSION_MAJOR
 #undef AZURE_STORAGE_FILES_SHARES_VERSION_MINOR
diff --git a/sdk/storage/azure-storage-files-shares/src/share_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_client.cpp
index f22c0685f..6dd5619e0 100644
--- a/sdk/storage/azure-storage-files-shares/src/share_client.cpp
+++ b/sdk/storage/azure-storage-files-shares/src/share_client.cpp
@@ -58,7 +58,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         newOptions,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -78,7 +78,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
diff --git a/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp
index d86769c8e..2b35224c3 100644
--- a/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp
+++ b/sdk/storage/azure-storage-files-shares/src/share_directory_client.cpp
@@ -60,7 +60,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         newOptions,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -82,7 +82,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
diff --git a/sdk/storage/azure-storage-files-shares/src/share_file_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_file_client.cpp
index e003ab4b2..0f17f22aa 100644
--- a/sdk/storage/azure-storage-files-shares/src/share_file_client.cpp
+++ b/sdk/storage/azure-storage-files-shares/src/share_file_client.cpp
@@ -64,7 +64,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         newOptions,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -86,7 +86,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
diff --git a/sdk/storage/azure-storage-files-shares/src/share_service_client.cpp b/sdk/storage/azure-storage-files-shares/src/share_service_client.cpp
index 46ec85c63..940dd9196 100644
--- a/sdk/storage/azure-storage-files-shares/src/share_service_client.cpp
+++ b/sdk/storage/azure-storage-files-shares/src/share_service_client.cpp
@@ -55,7 +55,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         newOptions,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
@@ -77,7 +77,7 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares {
     m_pipeline = std::make_shared<Azure::Core::Http::_internal::HttpPipeline>(
         options,
         Storage::_detail::FileServicePackageName,
-        _detail::Version::VersionString(),
+        PackageVersion::VersionString(),
         std::move(perRetryPolicies),
         std::move(perOperationPolicies));
   }
diff --git a/sdk/template/azure-template/inc/azure/template/version.hpp b/sdk/template/azure-template/inc/azure/template/version.hpp
index 8ff41aa2e..d212a0871 100644
--- a/sdk/template/azure-template/inc/azure/template/version.hpp
+++ b/sdk/template/azure-template/inc/azure/template/version.hpp
@@ -17,7 +17,7 @@ namespace Azure { namespace Template {
   /**
    * @brief Provides version information.
    */
-  class Version {
+  class PackageVersion {
   public:
     /// Major numeric identifier.
     static constexpr int Major = AZURE_TEMPLATE_VERSION_MAJOR;
diff --git a/sdk/template/azure-template/src/template_client.cpp b/sdk/template/azure-template/src/template_client.cpp
index 409e21d01..521d874b1 100644
--- a/sdk/template/azure-template/src/template_client.cpp
+++ b/sdk/template/azure-template/src/template_client.cpp
@@ -8,4 +8,4 @@
 
 using namespace Azure::Template;
 
-std::string const TemplateClient::ClientVersion() { return Version::VersionString(); }
+std::string const TemplateClient::ClientVersion() { return PackageVersion::VersionString(); }
diff --git a/sdk/template/azure-template/src/version.cpp b/sdk/template/azure-template/src/version.cpp
index 8695c78b5..df3db882a 100644
--- a/sdk/template/azure-template/src/version.cpp
+++ b/sdk/template/azure-template/src/version.cpp
@@ -7,19 +7,19 @@
 
 using namespace Azure::Template;
 
-const std::string Version::PreRelease = secret;
+const std::string PackageVersion::PreRelease = secret;
 
-std::string Version::VersionString()
+std::string PackageVersion::VersionString()
 {
   static const std::string versionString = [] {
     std::string version;
     std::stringstream ss;
     std::string dot = ".";
 
-    ss << Version::Major << dot << Version::Minor << dot << Version::Patch;
+    ss << PackageVersion::Major << dot << PackageVersion::Minor << dot << PackageVersion::Patch;
 
-    if (!Version::PreRelease.empty())
-      ss << "-" << Version::PreRelease;
+    if (!PackageVersion::PreRelease.empty())
+      ss << "-" << PackageVersion::PreRelease;
 
     return ss.str();
   }();