diff --git a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams.mjml b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams.mjml
index 4c92ac4f07..58e8984f4b 100644
--- a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams.mjml
+++ b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-enterprise-teams.mjml
@@ -9,7 +9,7 @@
     <mj-body>
         <!-- Blue Header Section -->
         <mj-wrapper css-class="border-fix" padding="20px 20px 10px 20px">
-            <mj-bw-hero
+            <mj-bw-ac-hero
                     title="You can now share passwords with members of <b>{{OrganizationName}}!</b>"
                     img-src="https://assets.bitwarden.com/email/v1/ac-spot-enterprise.png"
                     button-text="Log in"
@@ -26,12 +26,12 @@
                     </mj-text>
                 </mj-column>
             </mj-section>
-            <mj-bw-icon-row
+            <mj-bw-ac-icon-row
                     icon-src="https://assets.bitwarden.com/email/v1/icon-enterprise.png"
                     icon-alt="Organization Icon"
                     text="Your account is owned by {{OrganizationName}} and is subject to their security and management policies."
             />
-            <mj-bw-icon-row
+            <mj-bw-ac-icon-row
                     icon-src="https://assets.bitwarden.com/email/v1/icon-account-switching-new.png"
                     icon-alt="Share Icon"
                     text="You can easily access and share passwords with your team."
@@ -42,7 +42,7 @@
 
         <!-- Learn More Section -->
         <mj-wrapper padding="8px 20px 10px 20px">
-            <mj-bw-learn-more-footer />
+            <mj-bw-ac-learn-more-footer />
         </mj-wrapper>
 
         <!-- Footer -->
diff --git a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-family-free.mjml b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-family-free.mjml
index 144350367c..c1c794e0a3 100644
--- a/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-family-free.mjml
+++ b/src/Core/MailTemplates/Mjml/emails/AdminConsole/OrganizationConfirmation/organization-confirmation-family-free.mjml
@@ -10,12 +10,12 @@
     <mj-body>
         <!-- Blue Header Section -->
         <mj-wrapper css-class="border-fix" padding="20px 20px 10px 20px">
-            <mj-bw-hero
+            <mj-bw-ac-hero
                     title="You can now share passwords with members of <b>{{OrganizationName}}!</b>"
                     img-src="https://assets.bitwarden.com/email/v1/ac-spot-family.png"
                     button-text="Log in"
                     button-url="{{WebVaultUrl}}">
-            </mj-bw-hero>
+            </mj-bw-ac-hero>
         </mj-wrapper>
 
         <!-- Main Content -->
@@ -27,18 +27,18 @@
                     </mj-text>
                 </mj-column>
             </mj-section>
-            <mj-bw-icon-row
+            <mj-bw-ac-icon-row
                     icon-src="https://assets.bitwarden.com/email/v1/icon-item-type.png"
                     icon-alt="Group Users Icon"
                     text="You can access passwords {{OrganizationName}} has shared with you.">
-            </mj-bw-icon-row>
-            <mj-bw-icon-row
+            </mj-bw-ac-icon-row>
+            <mj-bw-ac-icon-row
                     icon-src="https://assets.bitwarden.com/email/v1/icon-account-switching-new.png"
                     icon-alt="Share Icon"
                     text="You can easily share passwords with friends, family, or coworkers."
                     foot-url-text="Share passwords in Bitwarden"
                     foot-url="https://bitwarden.com/help/sharing">
-            </mj-bw-icon-row>
+            </mj-bw-ac-icon-row>
         </mj-wrapper>
 
         <!-- Download Mobile Apps Section -->
@@ -96,7 +96,7 @@
 
         <!-- Learn More Section -->
         <mj-wrapper padding="8px 20px 10px 20px">
-            <mj-bw-learn-more-footer />
+            <mj-bw-ac-learn-more-footer />
         </mj-wrapper>
 
         <!-- Footer -->