diff --git a/modules/expirychecker/public/about2expire.php b/modules/expirychecker/public/about2expire.php
index 05f2de1..7200a7b 100644
--- a/modules/expirychecker/public/about2expire.php
+++ b/modules/expirychecker/public/about2expire.php
@@ -55,12 +55,9 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'expirychecker:about2expire');
-$t->data['formTarget'] = Module::getModuleURL('expirychecker/about2expire.php');
-$t->data['formData'] = ['StateId' => $stateId];
-$t->data['daysLeft'] = $state['daysLeft'];
-$t->data['dayOrDays'] = (intval($state['daysLeft']) === 1 ? 'day' : 'days');
-$t->data['expiresAtTimestamp'] = $state['expiresAtTimestamp'];
-$t->data['accountName'] = $state['accountName'];
+$t->data['form_target'] = Module::getModuleURL('expirychecker/about2expire.php');
+$t->data['form_data'] = ['StateId' => $stateId];
+$t->data['days_left'] = $state['daysLeft'];
 $t->send();
 
 Logger::info('expirychecker - User has been warned that their password will expire soon.');
diff --git a/modules/expirychecker/public/expired.php b/modules/expirychecker/public/expired.php
index 07f8a55..95c42d4 100644
--- a/modules/expirychecker/public/expired.php
+++ b/modules/expirychecker/public/expired.php
@@ -48,10 +48,8 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'expirychecker:expired');
-$t->data['formTarget'] = Module::getModuleURL('expirychecker/expired.php');
-$t->data['formData'] = ['StateId' => $stateId];
-$t->data['expiresAtTimestamp'] = $state['expiresAtTimestamp'];
-$t->data['accountName'] = $state['accountName'];
+$t->data['form_target'] = Module::getModuleURL('expirychecker/expired.php');
+$t->data['form_data'] = ['StateId' => $stateId];
 $t->send();
 
 Logger::info('expirychecker - User has been told that their password has expired.');
diff --git a/modules/expirychecker/src/Auth/Process/ExpiryDate.php b/modules/expirychecker/src/Auth/Process/ExpiryDate.php
index 8503f16..c055a20 100644
--- a/modules/expirychecker/src/Auth/Process/ExpiryDate.php
+++ b/modules/expirychecker/src/Auth/Process/ExpiryDate.php
@@ -242,8 +242,6 @@ public function redirect2PasswordChange(
     ): void {
         $sessionType = 'expirychecker';
         /* Save state and redirect. */
-        $state['expiresAtTimestamp'] = $expiryTimestamp;
-        $state['accountName'] = $accountName;
         $id = State::saveState(
             $state,
             'expirychecker:redirected_to_password_change_url'
@@ -359,8 +357,6 @@ public function redirectToExpiredPage(array &$state, string $accountName, int $e
         ]));
 
         /* Save state and redirect. */
-        $state['expiresAtTimestamp'] = $expiryTimestamp;
-        $state['accountName'] = $accountName;
         $state['passwordChangeUrl'] = $this->passwordChangeUrl;
         $state['originalUrlParam'] = $this->originalUrlParam;
 
@@ -396,8 +392,6 @@ protected function redirectToWarningPage(array &$state, string $accountName, int
         }
 
         /* Save state and redirect. */
-        $state['expiresAtTimestamp'] = $expiryTimestamp;
-        $state['accountName'] = $accountName;
         $state['passwordChangeUrl'] = $this->passwordChangeUrl;
         $state['originalUrlParam'] = $this->originalUrlParam;
 
diff --git a/modules/material/themes/material/default/other_mfas.twig b/modules/material/themes/material/default/other_mfas.twig
index f333cdd..1922a0f 100644
--- a/modules/material/themes/material/default/other_mfas.twig
+++ b/modules/material/themes/material/default/other_mfas.twig
@@ -1,4 +1,4 @@
-{% if otherOptions|length > 0 %}
+{% if other_options|length > 0 %}
   <div layout-children="column" child-spacing="center">
     {# used type=button to avoid form submission on click since this is just used to display the ul #}
     <button id="others" type="button" class="mdl-button mdl-js-button">
@@ -7,7 +7,7 @@
       </span>
     </button>
     <ul class="mdl-menu mdl-js-menu mdl-menu--top-left" data-mdl-for="others">
-      {% for option in otherOptions %}
+      {% for option in other_options %}
         {# TODO: Non-interactive elements should not be assigned mouse or keyboard event listeners. #}
         <li class="mdl-menu__item" onclick="location.href = '{{ option.callback|raw }}'">
           <span class="mdl-list__item-primary-content">
diff --git a/modules/material/themes/material/default/selectidp-links.twig b/modules/material/themes/material/default/selectidp-links.twig
index eaa4fe4..2f91b16 100644
--- a/modules/material/themes/material/default/selectidp-links.twig
+++ b/modules/material/themes/material/default/selectidp-links.twig
@@ -37,9 +37,9 @@
 
       <div class="mdl-layout-spacer"></div>
 
-      {% if helpCenterUrl is defined and helpCenterUrl is not empty %}
+      {% if help_center_url is defined and help_center_url is not empty %}
         <nav class="mdl-navigation">
-          <a href="{{ helpCenterUrl|e(html_attr) }}" target="_blank" rel="noopener" class="mdl-navigation__link">
+          <a href="{{ help_center_url|e(html_attr) }}" target="_blank" rel="noopener" class="mdl-navigation__link">
             {{ '{selectidp-links:help}'|trans }}
           </a>
         </nav>
diff --git a/modules/material/themes/material/expirychecker/about2expire.twig b/modules/material/themes/material/expirychecker/about2expire.twig
index a6468ea..b4561ce 100644
--- a/modules/material/themes/material/expirychecker/about2expire.twig
+++ b/modules/material/themes/material/expirychecker/about2expire.twig
@@ -16,15 +16,15 @@
   </header>
   <main class="mdl-layout__content" layout-children="column">
     <form layout-children="column">
-      {% for name, value in formData %}
+      {% for name, value in form_data %}
         <input type="hidden" name="{{ name|e }}" value="{{ value|e }}">
       {% endfor %}
 
       <p class="mdl-typography--title margin">
-        {% if daysLeft < 2 %}
+        {% if days_left < 2 %}
           {{ '{about2expire:expiring_in_a_day}'|trans }}
         {% else %}
-          {{ '{about2expire:expiring_soon}'|trans({'%daysLeft%': daysLeft}) }}
+          {{ '{about2expire:expiring_soon}'|trans({'%daysLeft%': days_left}) }}
         {% endif %}
       </p>
 
diff --git a/modules/material/themes/material/expirychecker/expired.twig b/modules/material/themes/material/expirychecker/expired.twig
index e0cbf91..4001396 100644
--- a/modules/material/themes/material/expirychecker/expired.twig
+++ b/modules/material/themes/material/expirychecker/expired.twig
@@ -16,7 +16,7 @@
   </header>
   <main class="mdl-layout__content" layout-children="column">
     <form layout-children="column">
-      {% for name, value in formData %}
+      {% for name, value in form_data %}
         <input type="hidden" name="{{ name|e }}" value="{{ value|e }}">
       {% endfor %}
 
diff --git a/modules/material/themes/material/mfa/low-on-backup-codes.twig b/modules/material/themes/material/mfa/low-on-backup-codes.twig
index dcaff9d..adabba1 100644
--- a/modules/material/themes/material/mfa/low-on-backup-codes.twig
+++ b/modules/material/themes/material/mfa/low-on-backup-codes.twig
@@ -29,7 +29,7 @@
 
         <div class="mdl-card__title center">
           <p class="mdl-card__subtitle-text">
-            {{ '{mfa:running_out_info}'|trans({'%numBackupCodesRemaining%': numBackupCodesRemaining}) }}
+            {{ '{mfa:running_out_info}'|trans({'%numBackupCodesRemaining%': num_backup_codes_remaining}) }}
           </p>
         </div>
 
diff --git a/modules/material/themes/material/mfa/new-backup-codes.twig b/modules/material/themes/material/mfa/new-backup-codes.twig
index 1b6dd40..581520e 100644
--- a/modules/material/themes/material/mfa/new-backup-codes.twig
+++ b/modules/material/themes/material/mfa/new-backup-codes.twig
@@ -40,7 +40,7 @@
   </header>
   <main class="mdl-layout__content" layout-children="column">
     <form layout-children="column" method="post">
-      {% if newBackupCodes is not empty %}
+      {% if new_backup_codes is not empty %}
         <h1 class="mdl-typography--display-1">
           {{ '{mfa:new_codes_header}'|trans }}
         </h1>
@@ -57,12 +57,12 @@
         <div class="mdl-card mdl-shadow--8dp" style="min-height: 17em">
           <div class="mdl-card__supporting-text ff-temp-flexbug-fix" layout-children="column" id="code-card">
             <p class="fill-parent" layout-children="row">
-              <span flex>{{ '{mfa:account}'|trans({'%idpName%': idpName}) }}</span>
+              <span flex>{{ '{mfa:account}'|trans({'%idpName%': idp_name}) }}</span>
               <em class="mdl-typography--caption">{{ "now"|date("M j, Y") }}</em>
             </p>
 
             <div class="code-container">
-              {% for newCode in newBackupCodes %}
+              {% for newCode in new_backup_codes %}
                 <code>☐ {{ newCode }}</code>
               {% endfor %}
             </div>
@@ -90,8 +90,8 @@
             </button>
 
             <a
-              href="data:text/plain,{{ codesForDownload }}"
-              download="{{ idpName }}-printable-codes.txt"
+              href="data:text/plain,{{ codes_for_download }}"
+              download="{{ idp_name }}-printable-codes.txt"
               class="mdl-button mdl-button--primary"
             >
               {{ '{mfa:button_download}'|trans }}
@@ -112,7 +112,7 @@
             </script>
             <button class="mdl-button mdl-button--primary" type="button" onclick="copyCodesToClipboard(this)">
               {{ '{mfa:button_copy}'|trans }}
-              <textarea class="out-of-sight">{{ codesForClipboard }}</textarea>
+              <textarea class="out-of-sight">{{ codes_for_clipboard }}</textarea>
             </button>
           </div>
         </div>
@@ -131,7 +131,7 @@
           <div class="mdl-card__supporting-text">
             <p>
               {{ '{mfa:new_codes_failed}'|trans }}
-              <a href="{{ mfaSetupUrl }}" target="_blank" rel="noopener">{{ mfaSetupUrl }}</a>
+              <a href="{{ mfa_setup_url }}" target="_blank" rel="noopener">{{ mfa_setup_url }}</a>
             </p>
           </div>
         </div>
diff --git a/modules/material/themes/material/mfa/out-of-backup-codes.twig b/modules/material/themes/material/mfa/out-of-backup-codes.twig
index 4eb199e..e4e2cfa 100644
--- a/modules/material/themes/material/mfa/out-of-backup-codes.twig
+++ b/modules/material/themes/material/mfa/out-of-backup-codes.twig
@@ -29,7 +29,7 @@
 
         <div class="mdl-card__title center">
           <p class="mdl-card__subtitle-text">
-            {% if hasOtherMfaOptions %}
+            {% if has_other_mfa_options %}
               {{ '{mfa:has_options_besides_codes}'|trans }}
             {% else %}
               {{ '{mfa:has_no_more_options}'|trans }}
@@ -38,7 +38,7 @@
         </div>
 
         <div class="mdl-card__actions" layout-children="row">
-          {% if hasOtherMfaOptions %}
+          {% if has_other_mfa_options %}
             <button name="continue" type="submit" class="mdl-button">
               {{ '{mfa:button_later}'|trans }}
             </button>
diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.twig b/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.twig
index 8dbf08a..a3c03c7 100644
--- a/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.twig
+++ b/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.twig
@@ -42,19 +42,19 @@
           </div>
         </div>
 
-        {% if errorMessage is not empty %}
+        {% if error_message is not empty %}
           <div class="mdl-card__supporting-text" layout-children="column">
             <p class="mdl-color-text--red error">
               <i class="material-icons">error</i>
 
               <span class="mdl-typography--caption">
-                {{ errorMessage|e }}
+                {{ error_message|e }}
               </span>
             </p>
           </div>
 
           <script>
-            ga('send', 'event', 'error', 'backupcode', '{{ errorMessage|e('js')|raw }}');
+            ga('send', 'event', 'error', 'backupcode', '{{ error_message|e('js')|raw }}');
           </script>
         {% endif %}
 
diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig b/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
index 48d8ef8..68e7fec 100644
--- a/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
+++ b/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
@@ -29,7 +29,7 @@
 
         <div class="mdl-card__title center">
           <p class="mdl-card__subtitle-text">
-            {{ '{mfa:manager_sent}'|trans({'%managerEmail%': managerEmail}) }}
+            {{ '{mfa:manager_sent}'|trans({'%managerEmail%': manager_email}) }}
           </p>
         </div>
 
@@ -42,19 +42,19 @@
           </div>
         </div>
 
-        {% if errorMessage is not empty %}
+        {% if error_message is not empty %}
           <div class="mdl-card__supporting-text" layout-children="column">
             <p class="mdl-color-text--red error">
               <i class="material-icons">error</i>
 
               <span class="mdl-typography--caption">
-                {{ errorMessage|e }}
+                {{ error_message|e }}
               </span>
             </p>
           </div>
 
           <script>
-            ga('send', 'event', 'error', 'managercode', '{{ errorMessage|e('js')|raw }}');
+            ga('send', 'event', 'error', 'managercode', '{{ error_message|e('js')|raw }}');
           </script>
         {% endif %}
 
diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig b/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig
index d95926f..8353bbb 100644
--- a/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig
+++ b/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig
@@ -28,7 +28,7 @@
         </div>
 
         <div class="mdl-card__title center">
-          {{ '{mfa:account}'|trans({'%idpName%': idpName}) }}
+          {{ '{mfa:account}'|trans({'%idpName%': idp_name}) }}
         </div>
 
         <div class="mdl-card__supporting-text" layout-children="column">
@@ -40,19 +40,19 @@
           </div>
         </div>
 
-        {% if errorMessage is not empty %}
+        {% if error_message is not empty %}
           <div class="mdl-card__supporting-text" layout-children="column">
             <p class="mdl-color-text--red error">
               <i class="material-icons">error</i>
 
               <span class="mdl-typography--caption">
-                {{ errorMessage|e }}
+                {{ error_message|e }}
               </span>
             </p>
           </div>
 
           <script>
-            ga('send', 'event', 'error', 'totp', '{{ errorMessage|e('js')|raw }}');
+            ga('send', 'event', 'error', 'totp', '{{ error_message|e('js')|raw }}');
           </script>
         {% endif %}
 
diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-webauthn.twig b/modules/material/themes/material/mfa/prompt-for-mfa-webauthn.twig
index df53e36..0e0680e 100644
--- a/modules/material/themes/material/mfa/prompt-for-mfa-webauthn.twig
+++ b/modules/material/themes/material/mfa/prompt-for-mfa-webauthn.twig
@@ -5,11 +5,11 @@
 
   {{ include('header.twig') }}
 
-  <script src="{{ browserJsPath }}"></script>
+  <script src="{{ browser_js_path }}"></script>
 
   <script>
     function verifyWebAuthn() {
-      const loginChallenge = {{ mfaOptionData|raw }};
+      const loginChallenge = {{ mfa_option_data|raw }};
       SimpleWebAuthnBrowser.startAuthentication(loginChallenge.publicKey).then(submitForm).catch(handleError);
     }
 
@@ -65,7 +65,7 @@
   </script>
 </head>
 
-<body class="gradient-bg" onload="{{ supportsWebAuthn ? 'verifyWebAuthn()' : '' }}">
+<body class="gradient-bg" onload="{{ supports_web_authn ? 'verifyWebAuthn()' : '' }}">
 <div class="mdl-layout mdl-layout--fixed-header fill-viewport">
   <header class="mdl-layout__header">
     <div class="mdl-layout__header-row">
@@ -88,7 +88,7 @@
           </h1>
         </div>
 
-        {% if supportsWebAuthn %}
+        {% if supports_web_authn %}
           <div class="mdl-card__title">
             <p class="mdl-card__subtitle-text">
               {{ '{mfa:webauthn_instructions}'|trans }}
@@ -102,17 +102,17 @@
           </div>
         {% endif %}
 
-        {% if errorMessage is not empty %}
+        {% if error_message is not empty %}
           <script>
-            ga('send', 'event', 'error', 'webauthn', '{{ errorMessage|e('js')|raw }}');
+            ga('send', 'event', 'error', 'webauthn', '{{ error_message|e('js')|raw }}');
           </script>
         {% endif %}
         <div class="mdl-card__supporting-text" layout-children="column">
-          <p class="mdl-color-text--red error {{ errorMessage is empty ? 'hide' : 'show' }}">
+          <p class="mdl-color-text--red error {{ error_message is empty ? 'hide' : 'show' }}">
             <i class="material-icons">error</i>
 
             <span class="mdl-typography--caption">
-              {{ errorMessage|e }}
+              {{ error_message|e }}
             </span>
           </p>
         </div>
@@ -123,7 +123,7 @@
           <button
             type="button"
             onclick="verifyWebAuthn()"
-            class="mdl-button mdl-color-text--red {{ errorMessage is empty ? 'hide' : 'show' }}"
+            class="mdl-button mdl-color-text--red {{ error_message is empty ? 'hide' : 'show' }}"
           >
             {{ '{mfa:button_try_again}'|trans }}
           </button>
diff --git a/modules/material/themes/material/mfa/send-manager-mfa.twig b/modules/material/themes/material/mfa/send-manager-mfa.twig
index f23478a..db96bca 100644
--- a/modules/material/themes/material/mfa/send-manager-mfa.twig
+++ b/modules/material/themes/material/mfa/send-manager-mfa.twig
@@ -29,17 +29,17 @@
 
         <div class="mdl-card__title center">
           <p class="mdl-card__subtitle-text">
-            {{ '{mfa:manager_info}'|trans({'%managerEmail%': managerEmail})|raw }}
+            {{ '{mfa:manager_info}'|trans({'%managerEmail%': manager_email})|raw }}
           </p>
         </div>
 
-        {% if errorMessage is not empty %}
+        {% if error_message is not empty %}
           <div class="mdl-card__supporting-text" layout-children="column">
             <p class="mdl-color-text--red error">
               <i class="material-icons">error</i>
 
               <span class="mdl-typography--caption">
-              {{ errorMessage|e }}
+              {{ error_message|e }}
             </span>
             </p>
           </div>
diff --git a/modules/material/themes/material/profilereview/nag-for-mfa.twig b/modules/material/themes/material/profilereview/nag-for-mfa.twig
index bf0a6f3..b39eed5 100644
--- a/modules/material/themes/material/profilereview/nag-for-mfa.twig
+++ b/modules/material/themes/material/profilereview/nag-for-mfa.twig
@@ -40,9 +40,9 @@
 
           <span flex></span>
 
-          {% if mfaLearnMoreUrl is not empty %}
+          {% if mfa_learn_more_url is not empty %}
             <a
-              href="{{ mfaLearnMoreUrl }}"
+              href="{{ mfa_learn_more_url }}"
               target="_blank"
               rel="noopener"
               class="mdl-button mdl-button--primary margin"
diff --git a/modules/material/themes/material/profilereview/review.twig b/modules/material/themes/material/profilereview/review.twig
index b28cb38..1cc09d3 100644
--- a/modules/material/themes/material/profilereview/review.twig
+++ b/modules/material/themes/material/profilereview/review.twig
@@ -43,7 +43,7 @@
       </p>
 
       <section layout-children="row-top">
-        {% if mfaOptions|length > 0 %}
+        {% if mfa_options|length > 0 %}
           <div class="mdl-card fixed-width mdl-shadow--8dp">
             <div class="mdl-card__title center">
               <h1 class="mdl-card__title-text">
@@ -53,7 +53,7 @@
 
             <div class="mdl-card__title">
               <ul class="mdl-card__subtitle-text mdl-list">
-                {% for mfa in mfaOptions %}
+                {% for mfa in mfa_options %}
                   <li class="mdl-list__item mdl-list__item--three-line">
                     <span class="mdl-list__item-primary-content">
                       <img class="mdl-list__item-icon" src="mfa-{{ mfa.type }}.svg">
@@ -79,11 +79,11 @@
           </div>
         {% endif %}
 
-        {% if methodOptions|length > 0 %}
+        {% if method_options|length > 0 %}
           <div
             class="mdl-card fixed-width mdl-shadow--8dp"
             {# if there are two cards, remove the right margin so the buttons align with the edge of the card. #}
-            {% if methodOptions|length == 2 %}
+            {% if method_options|length == 2 %}
               style="margin-right: 0px"
             {% endif %}
           >
@@ -95,7 +95,7 @@
 
             <div class="mdl-card__title">
               <ul class="mdl-card__subtitle-text mdl-list">
-                {% for method in methodOptions %}
+                {% for method in method_options %}
                   <li class="mdl-list__item mdl-list__item--two-line">
                     <span class="mdl-list__item-primary-content">
                       <img class="mdl-list__item-icon" src="email.svg">
@@ -116,7 +116,7 @@
       </section>
 
       <section layout-children="row" child-spacing="end" class="fill-parent margin">
-        <a href="{{ profileUrl }}" target="_blank" rel="noopener" onclick="document.querySelector('button').click()"
+        <a href="{{ profile_url }}" target="_blank" rel="noopener" onclick="document.querySelector('button').click()"
            class="mdl-button mdl-button--colored" layout-children="row">
           {{ '{review:button_update}'|trans }} <i class="material-icons">launch</i>
         </a>
diff --git a/modules/material/themes/material/silauth/loginuserpass.twig b/modules/material/themes/material/silauth/loginuserpass.twig
index 7f72eca..06ef65e 100644
--- a/modules/material/themes/material/silauth/loginuserpass.twig
+++ b/modules/material/themes/material/silauth/loginuserpass.twig
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="{{ currentLanguage }}">
 <head>
-  <title>{{ '{login:title}'|trans({'%idpName%': idpName}) }}</title>
+  <title>{{ '{login:title}'|trans({'%idpName%': idp_name}) }}</title>
 
   {{ include('header.twig') }}
 
@@ -11,7 +11,7 @@
     }
   </script>
 
-  {% if siteKey is not empty %}
+  {% if site_key is not empty %}
     <script src='https://www.google.com/recaptcha/api.js?onload=onRecaptchaLoad&render=explicit' async defer></script>
 
     <script>
@@ -23,7 +23,7 @@
         var loginButton = document.querySelector('button');
 
         grecaptcha.render(loginButton, {
-          sitekey: '{{ siteKey|e('js')|raw }}',
+          sitekey: '{{ site_key|e('js')|raw }}',
           callback: submitForm
         });
       }
@@ -40,18 +40,18 @@
     <form method="post" autocomplete="off" onsubmit="event.target.onsubmit = preventDefault">
       <input type="hidden" name="AuthState" value="{{ (stateparams.AuthState??'')|e }}"/>
 
-      {% if csrfToken is defined %}
-        <input type="hidden" name="csrf-token" value="{{ csrfToken|e }}"/>
+      {% if csrf_token is defined %}
+        <input type="hidden" name="csrf-token" value="{{ csrf_token|e }}"/>
       {% endif %}
 
       <div class="mdl-card mdl-shadow--8dp fill-phone-viewport">
         <div class="mdl-card__media white-bg margin" layout-children="column">
-          <img src="/logo.png" alt="{{ '{login:logo}'|trans({'%idpName%': idpName}) }}">
+          <img src="/logo.png" alt="{{ '{login:logo}'|trans({'%idpName%': idp_name}) }}">
         </div>
 
         <div class="mdl-card__title center">
           <h1 class="mdl-card__title-text">
-            {{ '{login:header}'|trans({'%idpName%': idpName}) }}
+            {{ '{login:header}'|trans({'%idpName%': idp_name}) }}
           </h1>
         </div>
 
@@ -106,9 +106,9 @@
         {% endif %}
 
         <div class="mdl-card__actions" layout-children="row">
-          {% if passwordForgotUrl is not empty %}
+          {% if password_forgot_url is not empty %}
             <a
-              href="{{ passwordForgotUrl|e }}"
+              href="{{ password_forgot_url|e }}"
               target="_blank"
               rel="noopener"
               class="mdl-button mdl-button--colored mdl-typography--caption"
@@ -125,9 +125,9 @@
         </div>
 
         <section layout-children="row" child-spacing="space-around">
-          {% if helpCenterUrl is defined and helpCenterUrl is not empty %}
+          {% if help_center_url is defined and help_center_url is not empty %}
             <a
-              href="{{ helpCenterUrl }}"
+              href="{{ help_center_url }}"
               target="_blank"
               rel="noopener"
               class="mdl-button mdl-button--colored mdl-typography--body-2"
@@ -137,8 +137,8 @@
             </a>
           {% endif %}
 
-          {% if profileUrl is defined and profileUrl is not empty %}
-            <a href="{{ profileUrl }}"
+          {% if profile_url is defined and profile_url is not empty %}
+            <a href="{{ profile_url }}"
                target="_blank"
                rel="noopener"
                class="mdl-button mdl-button--colored mdl-typography--body-2"
diff --git a/modules/mfa/public/low-on-backup-codes.php b/modules/mfa/public/low-on-backup-codes.php
index 6351fc7..eb04896 100644
--- a/modules/mfa/public/low-on-backup-codes.php
+++ b/modules/mfa/public/low-on-backup-codes.php
@@ -1,12 +1,12 @@
 <?php
 
-use SimpleSAML\Module\mfa\LoggerFactory;
 use SimpleSAML\Auth\ProcessingChain;
 use SimpleSAML\Auth\State;
 use SimpleSAML\Configuration;
 use SimpleSAML\Error\BadRequest;
-use SimpleSAML\XHTML\Template;
 use SimpleSAML\Module\mfa\Auth\Process\Mfa;
+use SimpleSAML\Module\mfa\LoggerFactory;
+use SimpleSAML\XHTML\Template;
 
 $stateId = filter_input(INPUT_GET, 'StateId') ?? null;
 if (empty($stateId)) {
@@ -31,7 +31,7 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'mfa:low-on-backup-codes');
-$t->data['numBackupCodesRemaining'] = $state['numBackupCodesRemaining'];
+$t->data['num_backup_codes_remaining'] = $state['numBackupCodesRemaining'];
 $t->send();
 
 $logger->info(sprintf(
diff --git a/modules/mfa/public/new-backup-codes.php b/modules/mfa/public/new-backup-codes.php
index d824a55..67e61fe 100644
--- a/modules/mfa/public/new-backup-codes.php
+++ b/modules/mfa/public/new-backup-codes.php
@@ -34,11 +34,11 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'mfa:new-backup-codes');
-$t->data['mfaSetupUrl'] = $state['mfaSetupUrl'];
-$t->data['newBackupCodes'] = $state['newBackupCodes'] ?? [];
-$t->data['idpName'] = $globalConfig->getString('idp_display_name');
-$t->data['codesForDownload'] = urlencode(
-    $t->data['idpName'] . "\r\n" . join("\r\n", $t->data['newBackupCodes'])
+$t->data['mfa_setup_url'] = $state['mfaSetupUrl'];
+$t->data['new_backup_codes'] = $state['newBackupCodes'] ?? [];
+$t->data['idp_name'] = $globalConfig->getString('idp_display_name');
+$t->data['codes_for_download'] = urlencode(
+    $t->data['idp_name'] . "\r\n" . join("\r\n", $t->data['new_backup_codes'])
 );
-$t->data['codesForClipboard'] = $t->data['idpName'] . "\n" . join("\n", $t->data['newBackupCodes']);
+$t->data['codes_for_clipboard'] = $t->data['idp_name'] . "\n" . join("\n", $t->data['new_backup_codes']);
 $t->send();
diff --git a/modules/mfa/public/out-of-backup-codes.php b/modules/mfa/public/out-of-backup-codes.php
index 734fdde..70509f9 100644
--- a/modules/mfa/public/out-of-backup-codes.php
+++ b/modules/mfa/public/out-of-backup-codes.php
@@ -1,12 +1,12 @@
 <?php
 
-use SimpleSAML\Module\mfa\LoggerFactory;
 use SimpleSAML\Auth\ProcessingChain;
 use SimpleSAML\Auth\State;
 use SimpleSAML\Configuration;
 use SimpleSAML\Error\BadRequest;
-use SimpleSAML\XHTML\Template;
 use SimpleSAML\Module\mfa\Auth\Process\Mfa;
+use SimpleSAML\Module\mfa\LoggerFactory;
+use SimpleSAML\XHTML\Template;
 
 $stateId = filter_input(INPUT_GET, 'StateId') ?? null;
 if (empty($stateId)) {
@@ -32,7 +32,7 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'mfa:out-of-backup-codes');
-$t->data['hasOtherMfaOptions'] = $hasOtherMfaOptions;
+$t->data['has_other_mfa_options'] = $hasOtherMfaOptions;
 $t->send();
 
 $logger->info(sprintf(
diff --git a/modules/mfa/public/prompt-for-mfa.php b/modules/mfa/public/prompt-for-mfa.php
index c64205c..445a402 100644
--- a/modules/mfa/public/prompt-for-mfa.php
+++ b/modules/mfa/public/prompt-for-mfa.php
@@ -7,15 +7,15 @@
  * - mfaId
  */
 
-use SimpleSAML\Module\mfa\LoggerFactory;
-use SimpleSAML\Module\mfa\LoginBrowser;
 use SimpleSAML\Auth\ProcessingChain;
 use SimpleSAML\Auth\State;
 use SimpleSAML\Configuration;
 use SimpleSAML\Error\BadRequest;
+use SimpleSAML\Module\mfa\Auth\Process\Mfa;
+use SimpleSAML\Module\mfa\LoggerFactory;
+use SimpleSAML\Module\mfa\LoginBrowser;
 use SimpleSAML\Utils\HTTP;
 use SimpleSAML\XHTML\Template;
-use SimpleSAML\Module\mfa\Auth\Process\Mfa;
 
 $stateId = filter_input(INPUT_GET, 'StateId');
 if (empty($stateId)) {
@@ -120,17 +120,15 @@
 $mfaTemplateToUse = Mfa::getTemplateFor($mfaOption['type']);
 
 $t = new Template($globalConfig, $mfaTemplateToUse);
-$t->data['errorMessage'] = $errorMessage ?? null;
-$t->data['mfaOption'] = $mfaOption;
-$t->data['mfaOptionData'] = json_encode($mfaOption['data']);
-$t->data['mfaOptions'] = $mfaOptions;
-$t->data['stateId'] = $stateId;
-$t->data['supportsWebAuthn'] = LoginBrowser::supportsWebAuthn($userAgent);
+$t->data['error_message'] = $errorMessage ?? null;
+$t->data['mfa_option_data'] = json_encode($mfaOption['data']);
+$t->data['mfa_options'] = $mfaOptions;
+$t->data['supports_web_authn'] = LoginBrowser::supportsWebAuthn($userAgent);
 $browserJsHash = md5_file(__DIR__ . '/simplewebauthn/browser.js');
-$t->data['browserJsPath'] = '/module.php/mfa/simplewebauthn/browser.js?v=' . $browserJsHash;
-$t->data['managerEmail'] = $state['managerEmail'];
-$t->data['otherOptions'] = $otherOptions;
-$t->data['idpName'] = $globalConfig->getString('idp_display_name');
+$t->data['browser_js_path'] = '/module.php/mfa/simplewebauthn/browser.js?v=' . $browserJsHash;
+$t->data['manager_email'] = $state['managerEmail'];
+$t->data['other_options'] = $otherOptions;
+$t->data['idp_name'] = $globalConfig->getString('idp_display_name');
 $t->send();
 
 $logger->info(json_encode([
diff --git a/modules/mfa/public/send-manager-mfa.php b/modules/mfa/public/send-manager-mfa.php
index c1dab5b..a777cf7 100644
--- a/modules/mfa/public/send-manager-mfa.php
+++ b/modules/mfa/public/send-manager-mfa.php
@@ -6,13 +6,13 @@
  * - StateId
  */
 
-use SimpleSAML\Module\mfa\LoggerFactory;
 use SimpleSAML\Auth\State;
 use SimpleSAML\Configuration;
 use SimpleSAML\Error\BadRequest;
+use SimpleSAML\Module\mfa\Auth\Process\Mfa;
+use SimpleSAML\Module\mfa\LoggerFactory;
 use SimpleSAML\Utils\HTTP;
 use SimpleSAML\XHTML\Template;
-use SimpleSAML\Module\mfa\Auth\Process\Mfa;
 
 $stateId = filter_input(INPUT_GET, 'StateId');
 if (empty($stateId)) {
@@ -36,9 +36,8 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'mfa:send-manager-mfa');
-$t->data['stateId'] = $stateId;
-$t->data['managerEmail'] = $state['managerEmail'];
-$t->data['errorMessage'] = $errorMessage ?? null;
+$t->data['manager_email'] = $state['managerEmail'];
+$t->data['error_message'] = $errorMessage ?? null;
 $t->send();
 
 $logger->info(json_encode([
diff --git a/modules/profilereview/public/nag.php b/modules/profilereview/public/nag.php
index 7dae257..a020009 100644
--- a/modules/profilereview/public/nag.php
+++ b/modules/profilereview/public/nag.php
@@ -31,10 +31,10 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'profilereview:' . $state['template']);
-$t->data['profileUrl'] = $state['profileUrl'];
-$t->data['methodOptions'] = $state['methodOptions'] ?? [];
-$t->data['mfaOptions'] = $state['mfaOptions'] ?? [];
-$t->data['mfaLearnMoreUrl'] = $state['mfaLearnMoreUrl'];
+$t->data['profile_url'] = $state['profileUrl'];
+$t->data['method_options'] = $state['methodOptions'] ?? [];
+$t->data['mfa_options'] = $state['mfaOptions'] ?? [];
+$t->data['mfa_learn_more_url'] = $state['mfaLearnMoreUrl'];
 $t->send();
 
 $logger->warning(json_encode([
diff --git a/modules/profilereview/public/review.php b/modules/profilereview/public/review.php
index c8f8b3f..158374a 100644
--- a/modules/profilereview/public/review.php
+++ b/modules/profilereview/public/review.php
@@ -35,9 +35,9 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'profilereview:review');
-$t->data['profileUrl'] = $state['profileUrl'];
-$t->data['methodOptions'] = $state['methodOptions'];
-$t->data['mfaOptions'] = $state['mfaOptions'];
+$t->data['profile_url'] = $state['profileUrl'];
+$t->data['method_options'] = $state['methodOptions'];
+$t->data['mfa_options'] = $state['mfaOptions'];
 $t->send();
 
 $logger->warning(json_encode([
diff --git a/modules/silauth/public/loginuserpass.php b/modules/silauth/public/loginuserpass.php
index 1884316..12fc066 100644
--- a/modules/silauth/public/loginuserpass.php
+++ b/modules/silauth/public/loginuserpass.php
@@ -82,32 +82,23 @@
 $t = new Template($globalConfig, 'silauth:loginuserpass');
 $t->data['stateparams'] = array('AuthState' => $authStateId);
 $t->data['username'] = $username;
-$t->data['forceUsername'] = false;
-$t->data['rememberUsernameEnabled'] = false;
-$t->data['rememberMeEnabled'] = false;
 $t->data['errorcode'] = $errorCode;
 $t->data['errorparams'] = $errorParams;
-$t->data['csrfToken'] = $csrfProtector->getMasterToken();
-$t->data['profileUrl'] = $state['templateData']['profileUrl'] ?? '';
-$t->data['helpCenterUrl'] = $state['templateData']['helpCenterUrl'] ?? '';
+$t->data['csrf_token'] = $csrfProtector->getMasterToken();
+$t->data['profile_url'] = $state['templateData']['profileUrl'] ?? '';
+$t->data['help_center_url'] = $state['templateData']['helpCenterUrl'] ?? '';
 $t->data['announcement'] = AnnouncementUtils::getAnnouncement();
-$t->data['idpName'] = $globalConfig->getString('idp_display_name');
-$t->data['passwordForgotUrl'] = $globalConfig->getOptionalString('passwordForgotUrl', '');
+$t->data['idp_name'] = $globalConfig->getString('idp_display_name');
+$t->data['password_forgot_url'] = $globalConfig->getOptionalString('passwordForgotUrl', '');
 
 /* For simplicity's sake, don't bother telling this Request to trust any IP
  * addresses. This is okay because we only track the failures of untrusted
  * IP addresses, so there will be no failed logins of IP addresses we trust. */
 $request = new Request();
 if (Authenticator::isCaptchaRequired($username, $request->getUntrustedIpAddresses())) {
-    $t->data['siteKey'] = $recaptchaSiteKey;
+    $t->data['site_key'] = $recaptchaSiteKey;
 } else {
-    $t->data['siteKey'] = null;
-}
-
-if (isset($state['SPMetadata'])) {
-    $t->data['SPMetadata'] = $state['SPMetadata'];
-} else {
-    $t->data['SPMetadata'] = null;
+    $t->data['site_key'] = null;
 }
 
 $t->send();