diff --git a/benefits/core/migrations/0002_data.py b/benefits/core/migrations/0002_data.py
index 225db11ba..abaa895fc 100644
--- a/benefits/core/migrations/0002_data.py
+++ b/benefits/core/migrations/0002_data.py
@@ -127,8 +127,8 @@ def load_data(app, *args, **kwargs):
     AuthProvider = app.get_model("core", "AuthProvider")
 
     senior_auth_provider = AuthProvider.objects.create(
-        sign_out_button_template="core/includes/sign-out-button--senior.html",
-        sign_out_link_template="core/includes/sign-out-link--senior.html",
+        sign_out_button_template="core/includes/button--sign-out--senior.html",
+        sign_out_link_template="core/includes/link--sign-out--senior.html",
         client_name=os.environ.get("SENIOR_AUTH_PROVIDER_CLIENT_NAME", "senior-benefits-oauth-client-name"),
         client_id=os.environ.get("AUTH_PROVIDER_CLIENT_ID", "benefits-oauth-client-id"),
         authority=os.environ.get("AUTH_PROVIDER_AUTHORITY", "https://example.com"),
diff --git a/benefits/core/templates/core/includes/sign-out-button--senior.html b/benefits/core/templates/core/includes/button--sign-out--senior.html
similarity index 100%
rename from benefits/core/templates/core/includes/sign-out-button--senior.html
rename to benefits/core/templates/core/includes/button--sign-out--senior.html
diff --git a/benefits/core/templates/core/includes/sign-out-link--senior.html b/benefits/core/templates/core/includes/link--sign-out--senior.html
similarity index 69%
rename from benefits/core/templates/core/includes/sign-out-link--senior.html
rename to benefits/core/templates/core/includes/link--sign-out--senior.html
index 6eda77de7..99f046399 100644
--- a/benefits/core/templates/core/includes/sign-out-link--senior.html
+++ b/benefits/core/templates/core/includes/link--sign-out--senior.html
@@ -1,4 +1,4 @@
-{% extends "core/includes/sign-out-link.html" %}
+{% extends "core/includes/link--sign-out.html" %}
 {% load i18n %}
 
 {% block button_text %}
diff --git a/benefits/core/templates/core/includes/sign-out-link.html b/benefits/core/templates/core/includes/link--sign-out.html
similarity index 100%
rename from benefits/core/templates/core/includes/sign-out-link.html
rename to benefits/core/templates/core/includes/link--sign-out.html
diff --git a/tests/pytest/conftest.py b/tests/pytest/conftest.py
index aaea09338..3e7fad1fe 100644
--- a/tests/pytest/conftest.py
+++ b/tests/pytest/conftest.py
@@ -44,8 +44,8 @@ def model_PemData():
 @pytest.fixture
 def model_AuthProvider():
     auth_provider = AuthProvider.objects.create(
-        sign_out_button_template="core/includes/sign-out-button--senior.html",
-        sign_out_link_template="core/includes/sign-out-link--senior.html",
+        sign_out_button_template="core/includes/button--sign-out--senior.html",
+        sign_out_link_template="core/includes/link--sign-out--senior.html",
         client_name="Client",
         client_id="1234",
         authority="https://example.com",