diff --git a/benefits/core/templates/core/index.html b/benefits/core/templates/core/index.html
index 9552eaf1d..d1a60d10c 100644
--- a/benefits/core/templates/core/index.html
+++ b/benefits/core/templates/core/index.html
@@ -11,6 +11,6 @@
 
 {% block call-to-action %}
   {% translate "core.pages.index.button" as trigger_text %}
-  {% include "core/includes/modal-trigger.html" with id="agency-selector" classes="btn btn-lg btn-primary" text=trigger_text %}
-  {% include "core/includes/modal--agency-selector.html" with id="agency-selector" %}
+  {% include "core/includes/modal-trigger.html" with id="modal--agency-selector" classes="btn btn-lg btn-primary" text=trigger_text %}
+  {% include "core/includes/modal--agency-selector.html" with id="modal--agency-selector" %}
 {% endblock call-to-action %}
diff --git a/benefits/eligibility/templates/eligibility/includes/media-item--bankcardcheck--start.html b/benefits/eligibility/templates/eligibility/includes/media-item--bankcardcheck--start.html
index 2b1463977..b47387b77 100644
--- a/benefits/eligibility/templates/eligibility/includes/media-item--bankcardcheck--start.html
+++ b/benefits/eligibility/templates/eligibility/includes/media-item--bankcardcheck--start.html
@@ -15,9 +15,9 @@
         <p>
             {% translate "eligibility.pages.start.bankcard.text" %}
             {% translate "eligibility.pages.start.modal.title" as trigger_text %}
-            {% include "core/includes/modal-trigger-link.html" with id="contactless-modal" text=trigger_text %}
+            {% include "core/includes/modal-trigger-link.html" with id="modal--contactless" text=trigger_text %}
         </p>
     </div>
 
-    {% include "eligibility/includes/modal--contactless.html" with id="contactless-modal" size="modal-lg" %}
+    {% include "eligibility/includes/modal--contactless.html" with id="modal--contactless" size="modal-lg" %}
 {% endblock body %}
diff --git a/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--senior.html b/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--senior.html
index e1e9241d1..a46434fc4 100644
--- a/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--senior.html
+++ b/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--senior.html
@@ -11,7 +11,7 @@
         <p>
             {% translate "eligibility.pages.start.senior.start_item.details" %}
             {% translate "eligibility.pages.start.senior.help.link_text" as trigger_text %}
-            {% include "core/includes/modal-trigger-link.html" with id="identity-verification-help" text=trigger_text %}
+            {% include "core/includes/modal-trigger-link.html" with id="modal--identity-verification" text=trigger_text %}
         </p>
         <div class="media-body--items">
             <p>{% translate "eligibility.pages.start.senior.start_item.secondary_details" %}</p>
@@ -23,5 +23,5 @@
         </div>
     </div>
 
-    {% include "eligibility/includes/modal--senior-start-help.html" with size="modal-lg" id="identity-verification-help" %}
+    {% include "eligibility/includes/modal--senior-start-help.html" with size="modal-lg" id="modal--identity-verification" %}
 {% endblock body %}
diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html
index e1f3b7dea..f19642a2a 100644
--- a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html
+++ b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html
@@ -9,9 +9,10 @@
     {% translate "eligibility.pages.index.senior.description" %}
 
     <!-- Button to trigger modal -->
-    <button id="login" type="button" class="border-0 bg-transparent p-0" data-bs-toggle="modal" data-bs-target="#login-gov-help">
+    <button id="login" type="button" class="border-0 bg-transparent p-0" data-bs-toggle="modal" data-bs-target="#modal--login-gov">
         <span class="fallback-text color-logo">Login.gov</span>
-    </button>.
+    </button>
+    .
 
-    {% include "eligibility/includes/modal--senior-help.html" with id="login-gov-help" size="modal-lg" %}
+    {% include "eligibility/includes/modal--senior-help.html" with id="modal--login-gov" size="modal-lg" %}
 {% endblock description %}
diff --git a/benefits/enrollment/templates/enrollment/includes/media-item--bankcardcheck--index.html b/benefits/enrollment/templates/enrollment/includes/media-item--bankcardcheck--index.html
index 9beb5aa8d..25611da96 100644
--- a/benefits/enrollment/templates/enrollment/includes/media-item--bankcardcheck--index.html
+++ b/benefits/enrollment/templates/enrollment/includes/media-item--bankcardcheck--index.html
@@ -14,11 +14,11 @@
     <div class="media-body--details">
         <p>
             {% translate "enrollment.pages.index.link_card_item.p[0]s[0]" %}
-            {% include "core/includes/modal-trigger-link.html" with id="littlepay-modal" text="Littlepay" %}
+            {% include "core/includes/modal-trigger-link.html" with id="modal--littlepay" text="Littlepay" %}
             {% translate "enrollment.pages.index.link_card_item.p[0]s[1]" %}
         </p>
         <p>{% translate "enrollment.pages.index.link_card_item.p[1]s[0]" %}</p>
     </div>
 
-    {% include "enrollment/includes/modal--littlepay.html" with id="littlepay-modal" size="modal-md" %}
+    {% include "enrollment/includes/modal--littlepay.html" with id="modal--littlepay" size="modal-md" %}
 {% endblock body %}