diff --git a/benefits/core/templates/core/base.html b/benefits/core/templates/core/base.html
index 7567bf0ed1..69e4014591 100644
--- a/benefits/core/templates/core/base.html
+++ b/benefits/core/templates/core/base.html
@@ -2,14 +2,14 @@
 {% load i18n %}
 {% load static %}
 {% get_current_language as LANGUAGE_CODE %}
-<!doctype html>
+<!DOCTYPE html>
 <html lang="{{ LANGUAGE_CODE }}" class="{% block classes %}{% endblock classes %}">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="description" content="{% translate "core.pages.help.about.p[0]" %}">
     {# djlint:off #}
-    <title>{% block page_title %}{% if page.title %}{{ page.title }}&nbsp;|&nbsp;{% endif %}{% endblock page_title %}{% translate "core.pages.title.suffix" %}</title>
+    <title>{% block page-title %}{% if page.title %}{{ page.title }}&nbsp;|&nbsp;{% endif %}{% endblock page-title %}{% translate "core.pages.title.suffix" %}</title>
     {# djlint:on #}
 
     <link href="https://fonts.googleapis.com/css?family=Roboto:400,500,700" rel="stylesheet" type="text/css">
@@ -57,16 +57,8 @@
       <div id="header-container" class="navbar navbar-expand-sm navbar-dark bg-primary justify-content-between">
         <div class="container">
           <span class="navbar-brand p-0">
-            <img class="sm d-lg-none"
-                 src="{% static "img/logo-sm.svg" %}"
-                 width="90"
-                 height="51.3"
-                 alt="{% translate "core.logos.small" context "image alt text" %}"/>
-            <img class="lg d-none d-lg-block"
-                 src="{% static "img/logo-lg.svg" %}"
-                 width="220"
-                 height="50"
-                 alt="{% translate "core.logos.large" context "image alt text" %}"/>
+            <img class="sm d-lg-none" src="{% static "img/logo-sm.svg" %}" width="90" height="51.3" alt="{% translate "core.logos.small" context "image alt text" %}" />
+            <img class="lg d-none d-lg-block" src="{% static "img/logo-lg.svg" %}" width="220" height="50" alt="{% translate "core.logos.large" context "image alt text" %}" />
           </span>
           <div class="form-inline">{% include "core/includes/lang-selector.html" %}</div>
         </div>
@@ -74,7 +66,7 @@
     </header>
 
     <main id="main-content" role="main">
-      {% block main_content %}
+      {% block main-content %}
         {% block nav-buttons %}
         {% endblock nav-buttons %}
         <div class="container main-row">
@@ -106,7 +98,7 @@ <h1>{{ page.headline }}</h1>
             </div>
           {% endblock call-to-action %}
         </div>
-      {% endblock main_content %}
+      {% endblock main-content %}
     </main>
 
     <footer id="footer">
diff --git a/benefits/core/templates/core/help.html b/benefits/core/templates/core/help.html
index ac1b1ca5d7..ab33411e0e 100644
--- a/benefits/core/templates/core/help.html
+++ b/benefits/core/templates/core/help.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load static %}
 
-{% block main_content %}
+{% block main-content %}
   <div class="container">
     <div class="row justify-content-center">
       <div class="col-10">
@@ -88,4 +88,4 @@ <h2 class="pt-8" id="questions">{% translate "core.pages.help.questions" %}</h2>
       </div>
     </div>
   </div>
-{% endblock main_content %}
+{% endblock main-content %}
diff --git a/benefits/core/templates/core/landing.html b/benefits/core/templates/core/landing.html
index 67ac0c4f5f..f26f008f42 100644
--- a/benefits/core/templates/core/landing.html
+++ b/benefits/core/templates/core/landing.html
@@ -4,7 +4,7 @@
   {{ block.super |add:" landing" }}
 {% endblock classes %}
 
-{% block main_content %}
+{% block main-content %}
   <div class="container">
     <div class="row align-items-end align-items-lg-center">
       <div class="col-lg-5">
@@ -17,4 +17,4 @@ <h2 class="p-sm pb-lg-8 pt-1 pt-lg-4 pb-4">{% translate "core.pages.landing.h2"
       </div>
     </div>
   </div>
-{% endblock main_content %}
+{% endblock main-content %}
diff --git a/benefits/core/templates/core/logged-out.html b/benefits/core/templates/core/logged-out.html
index 01207790b5..e75bc135c9 100644
--- a/benefits/core/templates/core/logged-out.html
+++ b/benefits/core/templates/core/logged-out.html
@@ -1,7 +1,7 @@
 {% extends "core/base.html" %}
 {% load i18n %}
 
-{% block main_content %}
+{% block main-content %}
     <div class="container">
         <div class="row justify-content-lg-center">
             <h1 class="pb-lg-8 pb-5">
@@ -11,4 +11,4 @@ <h1 class="pb-lg-8 pb-5">
             {% include "core/includes/icon.html" with icon=page.icon %}
         </div>
     </div>
-{% endblock main_content %}
+{% endblock main-content %}
diff --git a/benefits/eligibility/templates/eligibility/index.html b/benefits/eligibility/templates/eligibility/index.html
index 835c114d2b..9743503f94 100644
--- a/benefits/eligibility/templates/eligibility/index.html
+++ b/benefits/eligibility/templates/eligibility/index.html
@@ -5,9 +5,9 @@
   {{ block.super | add:" eligibility-index" }}
 {% endblock classes %}
 
-{% block page_title %}
+{% block page-title %}
   {% translate "eligibility.pages.index.title" %}&nbsp;|&nbsp;
-{% endblock page_title %}
+{% endblock page-title %}
 
 {% block nav-buttons %}
   {% url "core:index" as url %}
diff --git a/benefits/eligibility/templates/eligibility/start--mst-courtesy-card.html b/benefits/eligibility/templates/eligibility/start--mst-courtesy-card.html
index 6d287397c7..6bfd39993e 100644
--- a/benefits/eligibility/templates/eligibility/start--mst-courtesy-card.html
+++ b/benefits/eligibility/templates/eligibility/start--mst-courtesy-card.html
@@ -1,9 +1,9 @@
 {% extends "eligibility/start.html" %}
 {% load i18n %}
 
-{% block page_title %}
+{% block page-title %}
   {% translate "eligibility.pages.start.mst_cc.title" %}&nbsp;|&nbsp;
-{% endblock page_title %}
+{% endblock page-title %}
 
 {% block headline %}
   <div class="col-lg-10">
diff --git a/benefits/eligibility/templates/eligibility/start--senior.html b/benefits/eligibility/templates/eligibility/start--senior.html
index 368e3c97fe..31fe366f4a 100644
--- a/benefits/eligibility/templates/eligibility/start--senior.html
+++ b/benefits/eligibility/templates/eligibility/start--senior.html
@@ -1,9 +1,9 @@
 {% extends "eligibility/start.html" %}
 {% load i18n %}
 
-{% block page_title %}
+{% block page-title %}
   {% translate "eligibility.pages.start.senior.title" %}&nbsp;|&nbsp;
-{% endblock page_title %}
+{% endblock page-title %}
 
 {% block headline %}
   <div class="col-lg-10">
diff --git a/benefits/eligibility/templates/eligibility/start--veteran.html b/benefits/eligibility/templates/eligibility/start--veteran.html
index a361fef9a0..dcefab220f 100644
--- a/benefits/eligibility/templates/eligibility/start--veteran.html
+++ b/benefits/eligibility/templates/eligibility/start--veteran.html
@@ -1,9 +1,9 @@
 {% extends "eligibility/start.html" %}
 {% load i18n %}
 
-{% block page_title %}
+{% block page-title %}
   {% translate "eligibility.pages.start.veteran.title" %}&nbsp;|&nbsp;
-{% endblock page_title %}
+{% endblock page-title %}
 
 {% block headline %}
   <div class="col-lg-10">
diff --git a/benefits/eligibility/templates/eligibility/unverified.html b/benefits/eligibility/templates/eligibility/unverified.html
index 9a8d50338c..0a3470749c 100644
--- a/benefits/eligibility/templates/eligibility/unverified.html
+++ b/benefits/eligibility/templates/eligibility/unverified.html
@@ -1,6 +1,6 @@
 {% extends "core/base.html" %}
 
-{% block main_content %}
+{% block main-content %}
   {% include "core/includes/sign-out-link.html" %}
 
   <div class="container">
@@ -21,4 +21,4 @@
     </div>
 
   </div>
-{% endblock main_content %}
+{% endblock main-content %}
diff --git a/benefits/enrollment/templates/enrollment/index.html b/benefits/enrollment/templates/enrollment/index.html
index ebe05d8d17..3ac34b96e8 100644
--- a/benefits/enrollment/templates/enrollment/index.html
+++ b/benefits/enrollment/templates/enrollment/index.html
@@ -1,9 +1,9 @@
 {% extends "core/base.html" %}
 {% load i18n %}
 
-{% block page_title %}
+{% block page-title %}
   {% translate "enrollment.pages.index.title" %}&nbsp;|&nbsp;
-{% endblock page_title %}
+{% endblock page-title %}
 
 {% block nav-buttons %}
   {% include "core/includes/sign-out-link.html" %}
diff --git a/benefits/enrollment/templates/enrollment/retry.html b/benefits/enrollment/templates/enrollment/retry.html
index bf6af5f3dd..5916f138a2 100644
--- a/benefits/enrollment/templates/enrollment/retry.html
+++ b/benefits/enrollment/templates/enrollment/retry.html
@@ -1,6 +1,6 @@
 {% extends "core/base.html" %}
 
-{% block main_content %}
+{% block main-content %}
   {% include "core/includes/sign-out-link.html" %}
 
   <div class="container">
@@ -23,4 +23,4 @@
     {% endif %}
 
   </div>
-{% endblock main_content %}
+{% endblock main-content %}
diff --git a/benefits/enrollment/templates/enrollment/success.html b/benefits/enrollment/templates/enrollment/success.html
index b40f995983..7439ab9d3f 100644
--- a/benefits/enrollment/templates/enrollment/success.html
+++ b/benefits/enrollment/templates/enrollment/success.html
@@ -7,9 +7,9 @@
   {{ block.super |add:" enrollment-success" }}
 {% endblock classes %}
 
-{% block page_title %}
+{% block page-title %}
   {% translate "enrollment.pages.success.title" %}&nbsp;|&nbsp;
-{% endblock page_title %}
+{% endblock page-title %}
 
 {% block headline %}
   <div class="col-lg-8">
diff --git a/benefits/templates/200-user-error.html b/benefits/templates/200-user-error.html
index 23c87b6b20..8f7cb3ae3d 100644
--- a/benefits/templates/200-user-error.html
+++ b/benefits/templates/200-user-error.html
@@ -1,6 +1,6 @@
 {% extends "core/base.html" %}
 
-{% block main_content %}
+{% block main-content %}
   <div class="container">
     {% include "core/includes/icon-title.html" with title=page.headline icon=page.icon %}
 
@@ -14,4 +14,4 @@
       <div class="col-lg-3 col-8">{% include "core/includes/button--home.html" %}</div>
     </div>
   </div>
-{% endblock main_content %}
+{% endblock main-content %}
diff --git a/benefits/templates/400.html b/benefits/templates/400.html
index 23c87b6b20..8f7cb3ae3d 100644
--- a/benefits/templates/400.html
+++ b/benefits/templates/400.html
@@ -1,6 +1,6 @@
 {% extends "core/base.html" %}
 
-{% block main_content %}
+{% block main-content %}
   <div class="container">
     {% include "core/includes/icon-title.html" with title=page.headline icon=page.icon %}
 
@@ -14,4 +14,4 @@
       <div class="col-lg-3 col-8">{% include "core/includes/button--home.html" %}</div>
     </div>
   </div>
-{% endblock main_content %}
+{% endblock main-content %}
diff --git a/benefits/templates/404.html b/benefits/templates/404.html
index 23c87b6b20..8f7cb3ae3d 100644
--- a/benefits/templates/404.html
+++ b/benefits/templates/404.html
@@ -1,6 +1,6 @@
 {% extends "core/base.html" %}
 
-{% block main_content %}
+{% block main-content %}
   <div class="container">
     {% include "core/includes/icon-title.html" with title=page.headline icon=page.icon %}
 
@@ -14,4 +14,4 @@
       <div class="col-lg-3 col-8">{% include "core/includes/button--home.html" %}</div>
     </div>
   </div>
-{% endblock main_content %}
+{% endblock main-content %}
diff --git a/benefits/templates/500.html b/benefits/templates/500.html
index 23c87b6b20..8f7cb3ae3d 100644
--- a/benefits/templates/500.html
+++ b/benefits/templates/500.html
@@ -1,6 +1,6 @@
 {% extends "core/base.html" %}
 
-{% block main_content %}
+{% block main-content %}
   <div class="container">
     {% include "core/includes/icon-title.html" with title=page.headline icon=page.icon %}
 
@@ -14,4 +14,4 @@
       <div class="col-lg-3 col-8">{% include "core/includes/button--home.html" %}</div>
     </div>
   </div>
-{% endblock main_content %}
+{% endblock main-content %}
