diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/private/package_version.hpp b/sdk/core/azure-core-tracing-opentelemetry/src/private/package_version.hpp
index fb747ab53..ae3a040e8 100644
--- a/sdk/core/azure-core-tracing-opentelemetry/src/private/package_version.hpp
+++ b/sdk/core/azure-core-tracing-opentelemetry/src/private/package_version.hpp
@@ -21,20 +21,27 @@
 namespace Azure { namespace Core { namespace OpenTelemetry { namespace _detail {
   /**
    * @brief Provides version information.
-   *
    */
   class PackageVersion final {
   public:
-    /// Major numeric identifier.
+    /**
+     * @brief Major numeric identifier.
+     */
     static constexpr int32_t Major = AZURE_CORE_OPENTELEMETRY_VERSION_MAJOR;
 
-    /// Minor numeric identifier.
+    /**
+     * @brief Minor numeric identifier.
+     */
     static constexpr int32_t Minor = AZURE_CORE_OPENTELEMETRY_VERSION_MINOR;
 
-    /// Patch numeric identifier.
+    /**
+     * @brief Patch numeric identifier.
+     */
     static constexpr int32_t Patch = AZURE_CORE_OPENTELEMETRY_VERSION_PATCH;
 
-    /// Indicates whether the SDK is in a pre-release state.
+    /**
+     * @brief Indicates whether the SDK is in a pre-release state.
+     */
     static constexpr bool IsPreRelease
         = sizeof(AZURE_CORE_OPENTELEMETRY_VERSION_PRERELEASE) != sizeof("");
 
diff --git a/sdk/core/azure-core/src/private/package_version.hpp b/sdk/core/azure-core/src/private/package_version.hpp
index b3019f0bc..8b58e7793 100644
--- a/sdk/core/azure-core/src/private/package_version.hpp
+++ b/sdk/core/azure-core/src/private/package_version.hpp
@@ -21,20 +21,27 @@
 namespace Azure { namespace Core { namespace _detail {
   /**
    * @brief Provides version information.
-   *
    */
   class PackageVersion final {
   public:
-    /// Major numeric identifier.
+    /**
+     * @brief Major numeric identifier.
+     */
     static constexpr int32_t Major = AZURE_CORE_VERSION_MAJOR;
 
-    /// Minor numeric identifier.
+    /**
+     * @brief Minor numeric identifier.
+     */
     static constexpr int32_t Minor = AZURE_CORE_VERSION_MINOR;
 
-    /// Patch numeric identifier.
+    /**
+     * @brief Patch numeric identifier.
+     */
     static constexpr int32_t Patch = AZURE_CORE_VERSION_PATCH;
 
-    /// Indicates whether the SDK is in a pre-release state.
+    /**
+     * @brief Indicates whether the SDK is in a pre-release state.
+     */
     static constexpr bool IsPreRelease = sizeof(AZURE_CORE_VERSION_PRERELEASE) != sizeof("");
 
     /**
diff --git a/sdk/identity/azure-identity/src/private/package_version.hpp b/sdk/identity/azure-identity/src/private/package_version.hpp
index 31cb9c049..be447f687 100644
--- a/sdk/identity/azure-identity/src/private/package_version.hpp
+++ b/sdk/identity/azure-identity/src/private/package_version.hpp
@@ -21,20 +21,30 @@
 namespace Azure { namespace Identity { namespace _detail {
   /**
    * @brief Provides version information.
-   *
    */
   class PackageVersion final {
   public:
+    /**
+     * @brief Major numeric identifier.
+     */
     /// Major numeric identifier.
     static constexpr int32_t Major = AZURE_IDENTITY_VERSION_MAJOR;
 
+    /**
+     * @brief Minor numeric identifier.
+     */
     /// Minor numeric identifier.
     static constexpr int32_t Minor = AZURE_IDENTITY_VERSION_MINOR;
 
+    /**
+     * @brief Patch numeric identifier.
+     */
     /// Patch numeric identifier.
     static constexpr int32_t Patch = AZURE_IDENTITY_VERSION_PATCH;
 
-    /// Indicates whether the SDK is in a pre-release state.
+    /**
+     * @brief Indicates whether the SDK is in a pre-release state.
+     */
     static constexpr bool IsPreRelease = sizeof(AZURE_IDENTITY_VERSION_PRERELEASE) != sizeof("");
 
     /**
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/src/private/package_version.hpp b/sdk/keyvault/azure-security-keyvault-certificates/src/private/package_version.hpp
index 848ce8436..cdbc9936a 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/src/private/package_version.hpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/src/private/package_version.hpp
@@ -23,20 +23,27 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Certificat
   namespace _detail {
     /**
      * @brief Provides version information.
-     *
      */
     class PackageVersion final {
     public:
-      /// Major numeric identifier.
+      /**
+       * @brief Major numeric identifier.
+       */
       static constexpr int32_t Major = AZURE_SECURITY_KEYVAULT_CERTIFICATES_VERSION_MAJOR;
 
-      /// Minor numeric identifier.
+      /**
+       * @brief Minor numeric identifier.
+       */
       static constexpr int32_t Minor = AZURE_SECURITY_KEYVAULT_CERTIFICATES_VERSION_MINOR;
 
-      /// Patch numeric identifier.
+      /**
+       * @brief Patch numeric identifier.
+       */
       static constexpr int32_t Patch = AZURE_SECURITY_KEYVAULT_CERTIFICATES_VERSION_PATCH;
 
-      /// Indicates whether the SDK is in a pre-release state.
+      /**
+       * @brief Indicates whether the SDK is in a pre-release state.
+       */
       static constexpr bool IsPreRelease
           = sizeof(AZURE_SECURITY_KEYVAULT_CERTIFICATES_VERSION_PRERELEASE) != sizeof("");
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/package_version.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/package_version.hpp
index e6c31ee74..7d3ca6309 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/private/package_version.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/package_version.hpp
@@ -22,20 +22,27 @@
 namespace Azure { namespace Security { namespace KeyVault { namespace Keys { namespace _detail {
   /**
    * @brief Provides version information.
-   *
    */
   class PackageVersion final {
   public:
-    /// Major numeric identifier.
+    /**
+     * @brief Major numeric identifier.
+     */
     static constexpr int32_t Major = AZURE_SECURITY_KEYVAULT_KEYS_VERSION_MAJOR;
 
-    /// Minor numeric identifier.
+    /**
+     * @brief Minor numeric identifier.
+     */
     static constexpr int32_t Minor = AZURE_SECURITY_KEYVAULT_KEYS_VERSION_MINOR;
 
-    /// Patch numeric identifier.
+    /**
+     * @brief Patch numeric identifier.
+     */
     static constexpr int32_t Patch = AZURE_SECURITY_KEYVAULT_KEYS_VERSION_PATCH;
 
-    /// Indicates whether the SDK is in a pre-release state.
+    /**
+     * @brief Indicates whether the SDK is in a pre-release state.
+     */
     static constexpr bool IsPreRelease
         = sizeof(AZURE_SECURITY_KEYVAULT_KEYS_VERSION_PRERELEASE) != sizeof("");
 
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/src/private/package_version.hpp b/sdk/keyvault/azure-security-keyvault-secrets/src/private/package_version.hpp
index 3abc18be2..671d7e26f 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/src/private/package_version.hpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/src/private/package_version.hpp
@@ -22,20 +22,27 @@
 namespace Azure { namespace Security { namespace KeyVault { namespace Secrets { namespace _detail {
   /**
    * @brief Provides version information.
-   *
    */
   class PackageVersion final {
   public:
-    /// Major numeric identifier.
+    /**
+     * @brief Major numeric identifier.
+     */
     static constexpr int32_t Major = AZURE_SECURITY_KEYVAULT_SECRETS_VERSION_MAJOR;
 
-    /// Minor numeric identifier.
+    /**
+     * @brief Minor numeric identifier.
+     */
     static constexpr int32_t Minor = AZURE_SECURITY_KEYVAULT_SECRETS_VERSION_MINOR;
 
-    /// Patch numeric identifier.
+    /**
+     * @brief Patch numeric identifier.
+     */
     static constexpr int32_t Patch = AZURE_SECURITY_KEYVAULT_SECRETS_VERSION_PATCH;
 
-    /// Indicates whether the SDK is in a pre-release state.
+    /**
+     * @brief Indicates whether the SDK is in a pre-release state.
+     */
     static constexpr bool IsPreRelease
         = sizeof(AZURE_SECURITY_KEYVAULT_SECRETS_VERSION_PRERELEASE) != sizeof("");
 
diff --git a/sdk/storage/azure-storage-blobs/src/private/package_version.hpp b/sdk/storage/azure-storage-blobs/src/private/package_version.hpp
index 6f21bf905..14e2ca0d8 100644
--- a/sdk/storage/azure-storage-blobs/src/private/package_version.hpp
+++ b/sdk/storage/azure-storage-blobs/src/private/package_version.hpp
@@ -22,16 +22,24 @@ namespace Azure { namespace Storage { namespace Blobs { namespace _detail {
    */
   class PackageVersion final {
   public:
-    /// Major numeric identifier.
+    /**
+     * @brief Major numeric identifier.
+     */
     static constexpr int32_t Major = AZURE_STORAGE_BLOBS_VERSION_MAJOR;
 
-    /// Minor numeric identifier.
+    /**
+     * @brief Minor numeric identifier.
+     */
     static constexpr int32_t Minor = AZURE_STORAGE_BLOBS_VERSION_MINOR;
 
-    /// Patch numeric identifier.
+    /**
+     * @brief Patch numeric identifier.
+     */
     static constexpr int32_t Patch = AZURE_STORAGE_BLOBS_VERSION_PATCH;
 
-    /// Indicates whether the SDK is in a pre-release state.
+    /**
+     * @brief Indicates whether the SDK is in a pre-release state.
+     */
     static constexpr bool IsPreRelease
         = sizeof(AZURE_STORAGE_BLOBS_VERSION_PRERELEASE) != sizeof("");
 
diff --git a/sdk/storage/azure-storage-common/src/private/package_version.hpp b/sdk/storage/azure-storage-common/src/private/package_version.hpp
index 94b97b625..1f1c6a167 100644
--- a/sdk/storage/azure-storage-common/src/private/package_version.hpp
+++ b/sdk/storage/azure-storage-common/src/private/package_version.hpp
@@ -24,16 +24,24 @@ namespace Azure { namespace Storage { namespace Common { namespace _detail {
    */
   class PackageVersion final {
   public:
-    /// Major numeric identifier.
+    /**
+     * @brief Major numeric identifier.
+     */
     static constexpr int Major = AZURE_STORAGE_COMMON_VERSION_MAJOR;
 
-    /// Minor numeric identifier.
+    /**
+     * @brief Minor numeric identifier.
+     */
     static constexpr int Minor = AZURE_STORAGE_COMMON_VERSION_MINOR;
 
-    /// Patch numeric identifier.
+    /**
+     * @brief Patch numeric identifier.
+     */
     static constexpr int Patch = AZURE_STORAGE_COMMON_VERSION_PATCH;
 
-    /// Indicates whether the SDK is in a pre-release state.
+    /**
+     * @brief Indicates whether the SDK is in a pre-release state.
+     */
     static constexpr bool IsPreRelease
         = sizeof(AZURE_STORAGE_COMMON_VERSION_PRERELEASE) != sizeof("");
 
diff --git a/sdk/storage/azure-storage-files-datalake/src/private/package_version.hpp b/sdk/storage/azure-storage-files-datalake/src/private/package_version.hpp
index 680278e99..b90a56c11 100644
--- a/sdk/storage/azure-storage-files-datalake/src/private/package_version.hpp
+++ b/sdk/storage/azure-storage-files-datalake/src/private/package_version.hpp
@@ -23,16 +23,24 @@ namespace Azure { namespace Storage { namespace Files { namespace DataLake { nam
    */
   class PackageVersion final {
   public:
-    /// Major numeric identifier.
+    /**
+     * @brief Major numeric identifier.
+     */
     static constexpr int32_t Major = AZURE_STORAGE_FILES_DATALAKE_VERSION_MAJOR;
 
-    /// Minor numeric identifier.
+    /**
+     * @brief Minor numeric identifier.
+     */
     static constexpr int32_t Minor = AZURE_STORAGE_FILES_DATALAKE_VERSION_MINOR;
 
-    /// Patch numeric identifier.
+    /**
+     * @brief Patch numeric identifier.
+     */
     static constexpr int32_t Patch = AZURE_STORAGE_FILES_DATALAKE_VERSION_PATCH;
 
-    /// Indicates whether the SDK is in a pre-release state.
+    /**
+     * @brief Indicates whether the SDK is in a pre-release state.
+     */
     static constexpr bool IsPreRelease
         = sizeof(AZURE_STORAGE_FILES_DATALAKE_VERSION_PRERELEASE) != sizeof("");
 
diff --git a/sdk/storage/azure-storage-files-shares/src/private/package_version.hpp b/sdk/storage/azure-storage-files-shares/src/private/package_version.hpp
index 28dcd8731..a2568e105 100644
--- a/sdk/storage/azure-storage-files-shares/src/private/package_version.hpp
+++ b/sdk/storage/azure-storage-files-shares/src/private/package_version.hpp
@@ -22,16 +22,24 @@ namespace Azure { namespace Storage { namespace Files { namespace Shares { names
    */
   class PackageVersion final {
   public:
-    /// Major numeric identifier.
+    /**
+     * @brief Major numeric identifier.
+     */
     static constexpr int32_t Major = AZURE_STORAGE_FILES_SHARES_VERSION_MAJOR;
 
-    /// Minor numeric identifier.
+    /**
+     * @brief Minor numeric identifier.
+     */
     static constexpr int32_t Minor = AZURE_STORAGE_FILES_SHARES_VERSION_MINOR;
 
-    /// Patch numeric identifier.
+    /**
+     * @brief Patch numeric identifier.
+     */
     static constexpr int32_t Patch = AZURE_STORAGE_FILES_SHARES_VERSION_PATCH;
 
-    /// Indicates whether the SDK is in a pre-release state.
+    /**
+     * @brief Indicates whether the SDK is in a pre-release state.
+     */
     static constexpr bool IsPreRelease
         = sizeof(AZURE_STORAGE_FILES_SHARES_VERSION_PRERELEASE) != sizeof("");
 
diff --git a/sdk/storage/azure-storage-queues/src/private/package_version.hpp b/sdk/storage/azure-storage-queues/src/private/package_version.hpp
index 817761f96..914877b02 100644
--- a/sdk/storage/azure-storage-queues/src/private/package_version.hpp
+++ b/sdk/storage/azure-storage-queues/src/private/package_version.hpp
@@ -22,16 +22,24 @@ namespace Azure { namespace Storage { namespace Queues { namespace _detail {
    */
   class PackageVersion final {
   public:
-    /// Major numeric identifier.
+    /**
+     * @brief Major numeric identifier.
+     */
     static constexpr int32_t Major = AZURE_STORAGE_QUEUES_VERSION_MAJOR;
 
-    /// Minor numeric identifier.
+    /**
+     * @brief Minor numeric identifier.
+     */
     static constexpr int32_t Minor = AZURE_STORAGE_QUEUES_VERSION_MINOR;
 
-    /// Patch numeric identifier.
+    /**
+     * @brief Patch numeric identifier.
+     */
     static constexpr int32_t Patch = AZURE_STORAGE_QUEUES_VERSION_PATCH;
 
-    /// Indicates whether the SDK is in a pre-release state.
+    /**
+     * @brief Indicates whether the SDK is in a pre-release state.
+     */
     static constexpr bool IsPreRelease
         = sizeof(AZURE_STORAGE_QUEUES_VERSION_PRERELEASE) != sizeof("");
 
diff --git a/sdk/template/azure-template/src/private/package_version.hpp b/sdk/template/azure-template/src/private/package_version.hpp
index 4d3ab2446..cc45e0bca 100644
--- a/sdk/template/azure-template/src/private/package_version.hpp
+++ b/sdk/template/azure-template/src/private/package_version.hpp
@@ -22,16 +22,24 @@ namespace Azure { namespace Template { namespace _detail {
    */
   class PackageVersion final {
   public:
-    /// Major numeric identifier.
+    /**
+     * @brief Major numeric identifier.
+     */
     static constexpr int Major = AZURE_TEMPLATE_VERSION_MAJOR;
 
-    /// Minor numeric identifier.
+    /**
+     * @brief Minor numeric identifier.
+     */
     static constexpr int Minor = AZURE_TEMPLATE_VERSION_MINOR;
 
-    /// Patch numeric identifier.
+    /**
+     * @brief Patch numeric identifier.
+     */
     static constexpr int Patch = AZURE_TEMPLATE_VERSION_PATCH;
 
-    /// Indicates whether the SDK is in a pre-release state.
+    /**
+     * @brief Indicates whether the SDK is in a pre-release state.
+     */
     static constexpr bool IsPreRelease = sizeof(AZURE_TEMPLATE_VERSION_PRERELEASE) != sizeof("");
 
     /**