diff --git a/libraries/Util.php b/libraries/Util.php
index 41fcb36abb..bf9e036d6b 100644
--- a/libraries/Util.php
+++ b/libraries/Util.php
@@ -2671,7 +2671,7 @@ class Util
                 'class' => $class,
                 'placeholder' => $placeholder,
                 'selected'  => $selected,
-                'resultOptions' => $resultOptions,
+                'result_options' => $resultOptions,
             ]);
     }
 
@@ -2690,9 +2690,9 @@ class Util
     public static function getDivForSliderEffect($id = '', $message = '')
     {
         return Template::get('div_for_slider_effect')->render([
-            'id'                   => $id,
-            'InitialSlidersState'  => $GLOBALS['cfg']['InitialSlidersState'],
-            'message'              => $message,
+            'id'                    => $id,
+            'initial_sliders_state' => $GLOBALS['cfg']['InitialSlidersState'],
+            'message'               => $message,
         ]);
     }
 
@@ -2725,16 +2725,16 @@ class Util
 
         return Template::get('toggle_button')->render(
             [
-                'pmaThemeImage'     => $GLOBALS['pmaThemeImage'],
-                'text_dir'          => $GLOBALS['text_dir'],
-                'link_on'           => $link_on,
-                'toggleOn'          => str_replace(' ', ' ', htmlspecialchars(
+                'pma_theme_image' => $GLOBALS['pmaThemeImage'],
+                'text_dir'        => $GLOBALS['text_dir'],
+                'link_on'         => $link_on,
+                'toggle_on'       => str_replace(' ', ' ', htmlspecialchars(
                                         $options[1]['label'])),
-                'toggleOff'         => str_replace(' ', ' ', htmlspecialchars(
+                'toggle_off'      => str_replace(' ', ' ', htmlspecialchars(
                                         $options[0]['label'])),
-                'link_off'          => $link_off,
-                'callback'          => $callback,
-                'state'             => $state
+                'link_off'        => $link_off,
+                'callback'        => $callback,
+                'state'           => $state
             ]);
     } // end toggleButton()
 
diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php
index 07e9a8fe57..30205fbc95 100644
--- a/libraries/central_columns.lib.php
+++ b/libraries/central_columns.lib.php
@@ -879,11 +879,11 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db)
         . PMA\libraries\Template::get('columns_definitions/column_type')
             ->render(
                 array(
-                'columnNumber' => $row_num,
+                'column_number' => $row_num,
                 'ci' => 1,
                 'ci_offset' => 0,
                 'type_upper' => mb_strtoupper($row['col_type']),
-                'columnMeta' => array()
+                'column_meta' => array()
                 )
             )
         . '</td>';
@@ -893,7 +893,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db)
         . '</span>'
         . PMA\libraries\Template::get('columns_definitions/column_length')->render(
             array(
-                'columnNumber' => $row_num,
+                'column_number' => $row_num,
                 'ci' => 2,
                 'ci_offset' => 0,
                 'length_values_input_size' => 8,
@@ -964,10 +964,10 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db)
         . PMA\libraries\Template::get('columns_definitions/column_null')
             ->render(
                 array(
-                'columnNumber' => $row_num,
+                'column_number' => $row_num,
                 'ci' => 6,
                 'ci_offset' => 0,
-                'columnMeta' => array(
+                'column_meta' => array(
                     'Null' => $row['col_isNull']
                 )
                 )
@@ -979,10 +979,10 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db)
         . htmlspecialchars($row['col_extra']) . '</span>'
         . PMA\libraries\Template::get('columns_definitions/column_extra')->render(
             array(
-                'columnNumber' => $row_num,
+                'column_number' => $row_num,
                 'ci' => 7,
                 'ci_offset' => 0,
-                'columnMeta' => array('Extra'=>$row['col_extra'])
+                'column_meta' => array('Extra'=>$row['col_extra'])
             )
         )
         . '</td>';
@@ -1026,11 +1026,11 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num)
         . PMA\libraries\Template::get('columns_definitions/column_type')
             ->render(
                 array(
-                'columnNumber' => $row_num,
+                'column_number' => $row_num,
                 'ci' => 1,
                 'ci_offset' => 0,
                 'type_upper' => mb_strtoupper($row['col_type']),
-                'columnMeta' => array()
+                'column_meta' => array()
                 )
             )
         . '</td>';
@@ -1038,7 +1038,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num)
         '<td class="nowrap" name="col_length">'
         . PMA\libraries\Template::get('columns_definitions/column_length')->render(
             array(
-                'columnNumber' => $row_num,
+                'column_number' => $row_num,
                 'ci' => 2,
                 'ci_offset' => 0,
                 'length_values_input_size' => 8,
@@ -1100,10 +1100,10 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num)
         . PMA\libraries\Template::get('columns_definitions/column_null')
             ->render(
                 array(
-                'columnNumber' => $row_num,
+                'column_number' => $row_num,
                 'ci' => 6,
                 'ci_offset' => 0,
-                'columnMeta' => array(
+                'column_meta' => array(
                     'Null' => $row['col_isNull']
                 )
                 )
@@ -1114,10 +1114,10 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num)
         '<td class="nowrap" name="col_extra">'
         . PMA\libraries\Template::get('columns_definitions/column_extra')->render(
             array(
-                'columnNumber' => $row_num,
+                'column_number' => $row_num,
                 'ci' => 7,
                 'ci_offset' => 0,
-                'columnMeta' => array('Extra' => $row['col_extra'])
+                'column_meta' => array('Extra' => $row['col_extra'])
             )
         )
         . '</td>';
@@ -1183,9 +1183,9 @@ function PMA_getCentralColumnsTableFooter($pmaThemeImage, $text_dir)
     $html_output = PMA\libraries\Template::get('select_all')
         ->render(
             array(
-                'pmaThemeImage' => $pmaThemeImage,
-                'text_dir'      => $text_dir,
-                'formName'      => 'tableslistcontainer',
+                'pma_theme_image' => $pmaThemeImage,
+                'text_dir'        => $text_dir,
+                'form_name'       => 'tableslistcontainer',
             )
         );
     $html_output .= Util::getButtonOrImage(
@@ -1289,18 +1289,18 @@ function PMA_getHTMLforAddNewColumn($db, $total_rows)
         . PMA\libraries\Template::get('columns_definitions/column_type')
             ->render(
                 array(
-                'columnNumber' => 0,
+                'column_number' => 0,
                 'ci' => 1,
                 'ci_offset' => 0,
                 'type_upper' => '',
-                'columnMeta' => array()
+                'column_meta' => array()
                 )
             )
         . '</td>'
         . '<td class="nowrap" name="col_length">'
         . PMA\libraries\Template::get('columns_definitions/column_length')->render(
             array(
-                'columnNumber' => 0,
+                'column_number' => 0,
                 'ci' => 2,
                 'ci_offset' => 0,
                 'length_values_input_size' => 8,
@@ -1343,20 +1343,20 @@ function PMA_getHTMLforAddNewColumn($db, $total_rows)
         . PMA\libraries\Template::get('columns_definitions/column_null')
             ->render(
                 array(
-                'columnNumber' => 0,
+                'column_number' => 0,
                 'ci' => 6,
                 'ci_offset' => 0,
-                'columnMeta' => array()
+                'column_meta' => array()
                 )
             )
         . '</td>'
         . '<td class="nowrap" name="col_extra">'
         . PMA\libraries\Template::get('columns_definitions/column_extra')->render(
             array(
-                'columnNumber' => 0,
+                'column_number' => 0,
                 'ci' => 7,
                 'ci_offset' => 0,
-                'columnMeta' => array()
+                'column_meta' => array()
             )
         )
         . '</td>'
diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php
index 7184742412..0e8ad1ec14 100644
--- a/libraries/controllers/database/DatabaseStructureController.php
+++ b/libraries/controllers/database/DatabaseStructureController.php
@@ -369,7 +369,7 @@ class DatabaseStructureController extends DatabaseController
     {
         // filtering
         $this->response->addHTML(
-            Template::get('filter')->render(array('filterValue'=>''))
+            Template::get('filter')->render(array('filter_value'=>''))
         );
         // table form
         $this->response->addHTML(
diff --git a/libraries/controllers/server/ServerDatabasesController.php b/libraries/controllers/server/ServerDatabasesController.php
index 4d0ef9eb6e..7efbe50e28 100644
--- a/libraries/controllers/server/ServerDatabasesController.php
+++ b/libraries/controllers/server/ServerDatabasesController.php
@@ -101,7 +101,7 @@ class ServerDatabasesController extends Controller
             $html .= Template::get('server/databases/create')->render();
         }
 
-        $html .= Template::get('filter')->render(array('filterValue'=>''));
+        $html .= Template::get('filter')->render(array('filter_value'=>''));
 
         /**
          * Gets the databases list
@@ -390,9 +390,9 @@ class ServerDatabasesController extends Controller
         $html = Template::get('select_all')
             ->render(
                 array(
-                    'pmaThemeImage' => $GLOBALS['pmaThemeImage'],
-                    'text_dir'      => $GLOBALS['text_dir'],
-                    'formName'      => 'dbStatsForm',
+                    'pma_theme_image' => $GLOBALS['pmaThemeImage'],
+                    'text_dir'        => $GLOBALS['text_dir'],
+                    'form_name'       => 'dbStatsForm',
                 )
             );
 
diff --git a/libraries/controllers/server/ServerVariablesController.php b/libraries/controllers/server/ServerVariablesController.php
index c22db9fd42..2fc9034f48 100644
--- a/libraries/controllers/server/ServerVariablesController.php
+++ b/libraries/controllers/server/ServerVariablesController.php
@@ -293,7 +293,7 @@ class ServerVariablesController extends Controller
         // filter
         $filterValue = ! empty($_REQUEST['filter']) ? $_REQUEST['filter'] : '';
         $output = Template::get('filter')
-            ->render(array('filterValue' => $filterValue));
+            ->render(array('filter_value' => $filterValue));
 
         $output .= '<table id="serverVariables" class="data filteredData noclick">';
         $output .= Template::get('server/variables/variable_table_head')->render();
diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php
index 113ea91b51..da235897cf 100644
--- a/libraries/rte/rte_list.lib.php
+++ b/libraries/rte/rte_list.lib.php
@@ -149,9 +149,9 @@ function PMA_RTE_getList($type, $items)
         $retval .= Template::get('select_all')
             ->render(
                 array(
-                    'pmaThemeImage' => $GLOBALS['pmaThemeImage'],
-                    'text_dir'      => $GLOBALS['text_dir'],
-                    'formName'      => 'rteListForm',
+                    'pma_theme_image' => $GLOBALS['pmaThemeImage'],
+                    'text_dir'        => $GLOBALS['text_dir'],
+                    'form_name'       => 'rteListForm',
                 )
             );
         $retval .= PMA\libraries\Util::getButtonOrImage(
@@ -480,4 +480,3 @@ function PMA_EVN_getRowForList($event, $rowclass = '')
 
     return $retval;
 } // end PMA_EVN_getRowForList()
-
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 402d17c414..fb82a01663 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2356,9 +2356,9 @@ function PMA_getHtmlForSpecificDbPrivileges($db)
         $html_output .= Template::get('select_all')
             ->render(
                 array(
-                    'pmaThemeImage' => $GLOBALS['pmaThemeImage'],
-                    'text_dir'      => $GLOBALS['text_dir'],
-                    'formName'      => "usersForm",
+                    'pma_theme_image' => $GLOBALS['pmaThemeImage'],
+                    'text_dir'        => $GLOBALS['text_dir'],
+                    'form_name'       => "usersForm",
                 )
             );
         $html_output .= Util::getButtonOrImage(
@@ -2440,9 +2440,9 @@ function PMA_getHtmlForSpecificTablePrivileges($db, $table)
         $html_output .= Template::get('select_all')
             ->render(
                 array(
-                    'pmaThemeImage' => $GLOBALS['pmaThemeImage'],
-                    'text_dir'      => $GLOBALS['text_dir'],
-                    'formName'      => "usersForm",
+                    'pma_theme_image' => $GLOBALS['pmaThemeImage'],
+                    'text_dir'        => $GLOBALS['text_dir'],
+                    'form_name'       => "usersForm",
                 )
             );
         $html_output .= Util::getButtonOrImage(
@@ -3511,9 +3511,9 @@ function PMA_getUsersOverview($result, $db_rights, $pmaThemeImage, $text_dir)
         . Template::get('select_all')
             ->render(
                 array(
-                    'pmaThemeImage' => $pmaThemeImage,
-                    'text_dir'      => $text_dir,
-                    'formName'      => 'usersForm',
+                    'pma_theme_image' => $pmaThemeImage,
+                    'text_dir'        => $text_dir,
+                    'form_name'       => 'usersForm',
                 )
             ) . "\n";
     $html_output .= Util::getButtonOrImage(
diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php
index 856d8f37eb..18fd632f6f 100644
--- a/libraries/tracking.lib.php
+++ b/libraries/tracking.lib.php
@@ -352,9 +352,9 @@ function PMA_getHtmlForTableVersionDetails(
     $html .= PMA\libraries\Template::get('select_all')
         ->render(
             array(
-                'pmaThemeImage' => $pmaThemeImage,
-                'text_dir'      => $text_dir,
-                'formName'      => 'versionsForm',
+                'pma_theme_image' => $pmaThemeImage,
+                'text_dir'        => $text_dir,
+                'form_name'       => 'versionsForm',
             )
         );
     $html .= PMA\libraries\Util::getButtonOrImage(
@@ -1473,9 +1473,9 @@ function PMA_displayUntrackedTables(
     echo PMA\libraries\Template::get('select_all')
         ->render(
             array(
-                'pmaThemeImage' => $pmaThemeImage,
-                'text_dir'      => $text_dir,
-                'formName'      => 'untrackedForm',
+                'pma_theme_image' => $pmaThemeImage,
+                'text_dir'        => $text_dir,
+                'form_name'       => 'untrackedForm',
             )
         );
     echo PMA\libraries\Util::getButtonOrImage(
@@ -1681,9 +1681,9 @@ function PMA_displayTrackedTables(
     echo PMA\libraries\Template::get('select_all')
         ->render(
             array(
-                'pmaThemeImage' => $pmaThemeImage,
-                'text_dir'      => $text_dir,
-                'formName'      => 'trackedForm',
+                'pma_theme_image' => $pmaThemeImage,
+                'text_dir'        => $text_dir,
+                'form_name'       => 'trackedForm',
             )
         );
     echo PMA\libraries\Util::getButtonOrImage(
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index 2c747bdfb4..2d7129b5b9 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -284,7 +284,7 @@ function PMA_userprefsAutoloadGetHeader()
     return PMA\libraries\Template::get('prefs_autoload')
         ->render(
             array(
-                'hiddenInputs' => URL::getHiddenInputs(),
+                'hidden_inputs' => URL::getHiddenInputs(),
                 'return_url' => $return_url,
             )
         );
diff --git a/templates/columns_definitions/column_adjust_privileges.twig b/templates/columns_definitions/column_adjust_privileges.twig
index e316dae606..820889446e 100644
--- a/templates/columns_definitions/column_adjust_privileges.twig
+++ b/templates/columns_definitions/column_adjust_privileges.twig
@@ -1,13 +1,13 @@
 {% if privs_available %}
-    <input name="field_adjust_privileges[{{ columnNumber }}]"
-        id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
+    <input name="field_adjust_privileges[{{ column_number }}]"
+        id="field_{{ column_number }}_{{ ci - ci_offset }}"
         checked="checked"
         type="checkbox"
         value="NULL"
         class="allow_null"/>
 {% else %}
-    <input name="field_adjust_privileges[{{ columnNumber }}]"
-        id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
+    <input name="field_adjust_privileges[{{ column_number }}]"
+        id="field_{{ column_number }}_{{ ci - ci_offset }}"
         disabled
         type="checkbox"
         value="NULL"
diff --git a/templates/columns_definitions/column_attributes.phtml b/templates/columns_definitions/column_attributes.phtml
index c2b435fbe0..97f8636346 100644
--- a/templates/columns_definitions/column_attributes.phtml
+++ b/templates/columns_definitions/column_attributes.phtml
@@ -22,18 +22,18 @@ $ci_offset = -1;
     <!-- column type -->
     <?= PMA\libraries\Template::get('columns_definitions/column_type')
         ->render(array(
-            'columnNumber' => $columnNumber,
+            'column_number' => $columnNumber,
             'ci' => $ci++,
             'ci_offset' => $ci_offset,
             'type_upper' => $type_upper,
-            'columnMeta' => isset($columnMeta) ? $columnMeta : null
+            'column_meta' => isset($columnMeta) ? $columnMeta : null
         )); ?>
 </td>
 <td class="center">
     <!-- column length -->
     <?= PMA\libraries\Template::get('columns_definitions/column_length')
         ->render(array(
-            'columnNumber' => $columnNumber,
+            'column_number' => $columnNumber,
             'ci' => $ci++,
             'ci_offset' => $ci_offset,
             'length_values_input_size' => $length_values_input_size,
@@ -77,10 +77,10 @@ $ci_offset = -1;
     <!-- column NULL -->
     <?= PMA\libraries\Template::get('columns_definitions/column_null')
         ->render(array(
-            'columnNumber' => $columnNumber,
+            'column_number' => $columnNumber,
             'ci' => $ci++,
             'ci_offset' => $ci_offset,
-            'columnMeta' => isset($columnMeta) ? $columnMeta : null
+            'column_meta' => isset($columnMeta) ? $columnMeta : null
         )); ?>
 </td>
 <?php if (isset($_REQUEST['change_column']) && !empty($_REQUEST['change_column'])): ?>
@@ -89,7 +89,7 @@ $ci_offset = -1;
         <?php $privs_available = $GLOBALS['col_priv'] && $GLOBALS['is_reload_priv']; ?>
         <?= PMA\libraries\Template::get('columns_definitions/column_adjust_privileges')
             ->render(array(
-                'columnNumber' => $columnNumber,
+                'column_number' => $columnNumber,
                 'ci' => $ci++,
                 'ci_offset' => $ci_offset,
                 'privs_available' => $privs_available
@@ -101,10 +101,10 @@ $ci_offset = -1;
     <td class="center">
         <?= PMA\libraries\Template::get('columns_definitions/column_indexes')
             ->render(array(
-                'columnNumber' => $columnNumber,
+                'column_number' => $columnNumber,
                 'ci' => $ci++,
                 'ci_offset' => $ci_offset,
-                'columnMeta' => $columnMeta
+                'column_meta' => $columnMeta
             )); ?>
     </td>
 <?php endif; ?>
@@ -112,10 +112,10 @@ $ci_offset = -1;
     <!-- column auto_increment -->
     <?= PMA\libraries\Template::get('columns_definitions/column_auto_increment')
         ->render(array(
-            'columnNumber' => $columnNumber,
+            'column_number' => $columnNumber,
             'ci' => $ci++,
             'ci_offset' => $ci_offset,
-            'columnMeta' => $columnMeta
+            'column_meta' => $columnMeta
         )); ?>
 </td>
 <td class="center">
@@ -194,10 +194,10 @@ $ci_offset = -1;
         <!-- column Transformation options -->
         <?= PMA\libraries\Template::get('columns_definitions/transformation_option')
             ->render(array(
-                'columnNumber' => $columnNumber,
+                'column_number' => $columnNumber,
                 'ci' => $ci++,
                 'ci_offset' => $ci_offset,
-                'columnMeta' => $columnMeta,
+                'column_meta' => $columnMeta,
                 'mime_map' => $mime_map,
                 'type_prefix' => '',
             )); ?>
@@ -219,10 +219,10 @@ $ci_offset = -1;
         <!-- column Input transformation options -->
         <?= PMA\libraries\Template::get('columns_definitions/transformation_option')
             ->render(array(
-                'columnNumber' => $columnNumber,
+                'column_number' => $columnNumber,
                 'ci' => $ci++,
                 'ci_offset' => $ci_offset,
-                'columnMeta' => $columnMeta,
+                'column_meta' => $columnMeta,
                 'mime_map' => $mime_map,
                 'type_prefix' => 'input_',
             )); ?>
diff --git a/templates/columns_definitions/column_auto_increment.twig b/templates/columns_definitions/column_auto_increment.twig
index 2729c838f0..9bb1c3a066 100644
--- a/templates/columns_definitions/column_auto_increment.twig
+++ b/templates/columns_definitions/column_auto_increment.twig
@@ -1,6 +1,6 @@
-<input name="field_extra[{{ columnNumber }}]"
+<input name="field_extra[{{ column_number }}]"
     id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
-    {% if columnMeta['Extra'] is defined and columnMeta['Extra']|lower == 'auto_increment' -%}
+    {% if column_meta['Extra'] is defined and column_meta['Extra']|lower == 'auto_increment' -%}
         checked="checked"
     {%- endif %}
     type="checkbox"
diff --git a/templates/columns_definitions/column_extra.twig b/templates/columns_definitions/column_extra.twig
index 769d9f0337..c948d8e573 100644
--- a/templates/columns_definitions/column_extra.twig
+++ b/templates/columns_definitions/column_extra.twig
@@ -1,6 +1,6 @@
-<input name="col_extra[{{ columnNumber }}]"
-    id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
-    {% if columnMeta['Extra'] is not empty and columnMeta['Extra'] == 'auto_increment' -%}
+<input name="col_extra[{{ column_number }}]"
+    id="field_{{ column_number }}_{{ ci - ci_offset }}"
+    {% if column_meta['Extra'] is not empty and column_meta['Extra'] == 'auto_increment' -%}
         checked="checked"
     {%- endif %}
     type="checkbox"
diff --git a/templates/columns_definitions/column_indexes.twig b/templates/columns_definitions/column_indexes.twig
index 99b5244948..398022997a 100644
--- a/templates/columns_definitions/column_indexes.twig
+++ b/templates/columns_definitions/column_indexes.twig
@@ -1,24 +1,24 @@
-<select name="field_key[{{ columnNumber }}]"
-    id="field_{{ columnNumber }}_{{ ci - ci_offset }}" data-index="">
-    <option value="none_{{ columnNumber }}">---</option>
-    <option value="primary_{{ columnNumber }}" title="{% trans "Primary" %}"
-        {{- columnMeta['Key'] is defined and columnMeta['Key'] == 'PRI' ? ' selected="selected"' }}>
+<select name="field_key[{{ column_number }}]"
+    id="field_{{ column_number }}_{{ ci - ci_offset }}" data-index="">
+    <option value="none_{{ column_number }}">---</option>
+    <option value="primary_{{ column_number }}" title="{% trans "Primary" %}"
+        {{- column_meta['Key'] is defined and column_meta['Key'] == 'PRI' ? ' selected="selected"' }}>
         PRIMARY
     </option>
-    <option value="unique_{{ columnNumber }}" title="{% trans "Unique" %}"
-        {{- columnMeta['Key'] is defined and columnMeta['Key'] == 'UNI' ? ' selected="selected"' }}>
+    <option value="unique_{{ column_number }}" title="{% trans "Unique" %}"
+        {{- column_meta['Key'] is defined and column_meta['Key'] == 'UNI' ? ' selected="selected"' }}>
         UNIQUE
     </option>
-    <option value="index_{{ columnNumber }}" title="{% trans "Index" %}"
-        {{- columnMeta['Key'] is defined and columnMeta['Key'] == 'MUL' ? ' selected="selected"' }}>
+    <option value="index_{{ column_number }}" title="{% trans "Index" %}"
+        {{- column_meta['Key'] is defined and column_meta['Key'] == 'MUL' ? ' selected="selected"' }}>
         INDEX
     </option>
-    <option value="fulltext_{{ columnNumber }}" title="{% trans "Fulltext" %}"
-        {{- columnMeta['Key'] is defined and columnMeta['Key'] == 'FULLTEXT' ? ' selected="selected"' }}>
+    <option value="fulltext_{{ column_number }}" title="{% trans "Fulltext" %}"
+        {{- column_meta['Key'] is defined and column_meta['Key'] == 'FULLTEXT' ? ' selected="selected"' }}>
         FULLTEXT
     </option>
-    <option value="spatial_{{ columnNumber }}" title="{% trans "Spatial" %}"
-        {{- columnMeta['Key'] is defined and columnMeta['Key'] == 'SPATIAL' ? ' selected="selected"' }}>
+    <option value="spatial_{{ column_number }}" title="{% trans "Spatial" %}"
+        {{- column_meta['Key'] is defined and column_meta['Key'] == 'SPATIAL' ? ' selected="selected"' }}>
         SPATIAL
     </option>
 </select>
diff --git a/templates/columns_definitions/column_length.twig b/templates/columns_definitions/column_length.twig
index 0d967a5397..c0a0624d76 100644
--- a/templates/columns_definitions/column_length.twig
+++ b/templates/columns_definitions/column_length.twig
@@ -1,10 +1,10 @@
-<input id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
+<input id="field_{{ column_number }}_{{ ci - ci_offset }}"
     type="text"
-    name="field_length[{{ columnNumber }}]"
+    name="field_length[{{ column_number }}]"
     size="{{ length_values_input_size }}"
     value="{{ length_to_display }}"
     class="textfield" />
-<p class="enum_notice" id="enum_notice_{{ columnNumber }}_{{ ci - ci_offset }}">
+<p class="enum_notice" id="enum_notice_{{ column_number }}_{{ ci - ci_offset }}">
     <a href="#" class="open_enum_editor">
         {% trans 'Edit ENUM/SET values' %}
     </a>
diff --git a/templates/columns_definitions/column_null.twig b/templates/columns_definitions/column_null.twig
index 78eba4bdcc..03b71e129c 100644
--- a/templates/columns_definitions/column_null.twig
+++ b/templates/columns_definitions/column_null.twig
@@ -1,6 +1,6 @@
-<input name="field_null[{{ columnNumber }}]"
-    id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
-    {% if columnMeta['Null'] is not empty and columnMeta['Null'] != 'NO' and columnMeta['Null'] != 'NOT NULL' -%}
+<input name="field_null[{{ column_number }}]"
+    id="field_{{ column_number }}_{{ ci - ci_offset }}"
+    {% if column_meta['Null'] is not empty and column_meta['Null'] != 'NO' and column_meta['Null'] != 'NOT NULL' -%}
         checked="checked"
     {%- endif %}
     type="checkbox"
diff --git a/templates/columns_definitions/column_type.twig b/templates/columns_definitions/column_type.twig
index 83f4f500d0..c8f72a3459 100644
--- a/templates/columns_definitions/column_type.twig
+++ b/templates/columns_definitions/column_type.twig
@@ -1,7 +1,7 @@
 <select class="column_type"
-    name="field_type[{{ columnNumber }}]"
-    id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
-    {%- if columnMeta['column_status'] is defined and not columnMeta['column_status']['isEditable'] -%}
+    name="field_type[{{ column_number }}]"
+    id="field_{{ column_number }}_{{ ci - ci_offset }}"
+    {%- if column_meta['column_status'] is defined and not column_meta['column_status']['isEditable'] -%}
     disabled="disabled"
     {%- endif %}>
     {{ Util_getSupportedDatatypes(true, type_upper) }}
diff --git a/templates/columns_definitions/transformation_option.twig b/templates/columns_definitions/transformation_option.twig
index 27cbb49b04..1497778d4e 100644
--- a/templates/columns_definitions/transformation_option.twig
+++ b/templates/columns_definitions/transformation_option.twig
@@ -1,9 +1,9 @@
 {% set options_key = type_prefix ~ 'transformation_options' %}
-<input id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
+<input id="field_{{ column_number }}_{{ ci - ci_offset }}"
     type="text"
-    name="field_{{ options_key }}[{{ columnNumber }}]"
+    name="field_{{ options_key }}[{{ column_number }}]"
     size="16"
     class="textfield"
-    value="{% if columnMeta['Field'] is defined and mime_map[columnMeta['Field']][options_key] is defined -%}
-        {{- mime_map[columnMeta['Field']][options_key] -}}
+    value="{% if column_meta['Field'] is defined and mime_map[column_meta['Field']][options_key] is defined -%}
+        {{- mime_map[column_meta['Field']][options_key] -}}
     {%- endif %}" />
diff --git a/templates/console/bookmark_content.phtml b/templates/console/bookmark_content.phtml
index 247f03fee8..6ef5d00e96 100644
--- a/templates/console/bookmark_content.phtml
+++ b/templates/console/bookmark_content.phtml
@@ -9,8 +9,8 @@
             <?= PMA\libraries\Template::get('console/query_action')
                 ->render(
                     array(
-                        'parentDivClasses'  => 'action_content',
-                        'contentArray'      => [
+                        'parent_div_classes' => 'action_content',
+                        'content_array'      => [
                             ['action collapse',         __('Collapse')],
                             ['action expand',           __('Expand')],
                             ['action requery',          __('Requery')],
diff --git a/templates/console/display.phtml b/templates/console/display.phtml
index 1584735eef..098c9ff2ff 100644
--- a/templates/console/display.phtml
+++ b/templates/console/display.phtml
@@ -4,8 +4,8 @@
         <?= PMA\libraries\Template::get('console/toolbar')
         ->render(
             array(
-                'parentDivClasses'  => 'collapsed',
-                'contentArray'      => [
+                'parent_div_classes' => 'collapsed',
+                'content_array'      => [
                     ['switch_button console_switch',    __('Console'),'image'=> $image],
                     ['button clear',                    __('Clear')],
                     ['button history',                  __('History')],
@@ -43,8 +43,8 @@
                         <?= PMA\libraries\Template::get('console/query_action')
                             ->render(
                                 array(
-                                    'parentDivClasses'  => 'action_content',
-                                    'contentArray'      => [
+                                    'parent_div_classes' => 'action_content',
+                                    'content_array'      => [
                                         ['action collapse',     __('Collapse')],
                                         ['action expand',       __('Expand')],
                                         ['action requery',      __('Requery')],
@@ -76,8 +76,8 @@
             <?= PMA\libraries\Template::get('console/toolbar')
                 ->render(
                     array(
-                        'parentDivClasses'  => '',
-                        'contentArray'      => [
+                        'parent_div_classes' => '',
+                        'content_array'      => [
                             ['button order order_asc',      __('ascending')],
                             ['button order order_desc',     __('descending')],
                             ['text',                        __('Order:')],
@@ -100,8 +100,8 @@
                 <?= PMA\libraries\Template::get('console/query_action')
                 ->render(
                     array(
-                        'parentDivClasses'  => 'debug_query action_content',
-                        'contentArray'      => [
+                        'parent_div_classes' => 'debug_query action_content',
+                        'content_array'      => [
                             ['action collapse',         __('Collapse')],
                             ['action expand',           __('Expand')],
                             ['action dbg_show_trace',   __('Show trace')],
@@ -119,8 +119,8 @@
             <?= PMA\libraries\Template::get('console/toolbar')
             ->render(
                 array(
-                    'parentDivClasses'  => '',
-                    'contentArray'      => [
+                    'parent_div_classes' => '',
+                    'content_array'      => [
                         ['switch_button',   __('Bookmarks')],
                         ['button refresh',  __('Refresh')],
                         ['button add',      __('Add')],
@@ -136,8 +136,8 @@
                 <?= PMA\libraries\Template::get('console/toolbar')
                 ->render(
                     array(
-                        'parentDivClasses'  => '',
-                        'contentArray'      => [
+                        'parent_div_classes' => '',
+                        'content_array'      => [
                             ['switch_button',   __('Add bookmark')]
                         ]
                     )
@@ -168,8 +168,8 @@
             <?= PMA\libraries\Template::get('console/toolbar')
             ->render(
                 array(
-                    'parentDivClasses'  => '',
-                    'contentArray'      => [
+                    'parent_div_classes' => '',
+                    'content_array'      => [
                         ['switch_button',   __('Options')],
                         ['button default',  __('Set default')]
                     ]
@@ -205,8 +205,8 @@
             <?= PMA\libraries\Template::get('console/query_action')
                 ->render(
                     array(
-                        'parentDivClasses'  => 'query_actions',
-                        'contentArray'      => [
+                        'parent_div_classes' => 'query_actions',
+                        'content_array'      => [
                             ['action collapse',     __('Collapse')],
                             ['action expand',       __('Expand')],
                             ['action requery',      __('Requery')],
diff --git a/templates/console/query_action.twig b/templates/console/query_action.twig
index 05dd12d769..62bc30ae93 100644
--- a/templates/console/query_action.twig
+++ b/templates/console/query_action.twig
@@ -1,5 +1,5 @@
-<div class="{{ parentDivClasses }}">
-    {% for content in contentArray %}
+<div class="{{ parent_div_classes }}">
+    {% for content in content_array %}
         {% if content is defined %}
         <span class="{{ content[0] }}">
             {{ content[1] }}
diff --git a/templates/console/toolbar.twig b/templates/console/toolbar.twig
index 35d25a40b9..b16c29042d 100644
--- a/templates/console/toolbar.twig
+++ b/templates/console/toolbar.twig
@@ -1,5 +1,5 @@
-<div class="toolbar {{ parentDivClasses }}">
-    {% for content in contentArray %}
+<div class="toolbar {{ parent_div_classes }}">
+    {% for content in content_array %}
         {% if content is defined %}
         <div class="{{ content[0] }}">
             {{ content['image'] is defined ? content['image']|raw }}
diff --git a/templates/database/designer/canvas.twig b/templates/database/designer/canvas.twig
index f81e7887b8..eaf920e1ed 100644
--- a/templates/database/designer/canvas.twig
+++ b/templates/database/designer/canvas.twig
@@ -1,3 +1,3 @@
 <div id="osn_tab">
-    <canvas class="pmd" id="canvas" width="100" height="100" ></canvas>
+    <canvas class="pmd" id="canvas" width="100" height="100"></canvas>
 </div>
diff --git a/templates/div_for_slider_effect.twig b/templates/div_for_slider_effect.twig
index 761de6660f..64539993d8 100644
--- a/templates/div_for_slider_effect.twig
+++ b/templates/div_for_slider_effect.twig
@@ -1,4 +1,4 @@
-{% if InitialSlidersState == 'disabled' %}
+{% if initial_sliders_state == 'disabled' %}
     <div{% if id is defined %} id="{{ id }}"{% endif %}>
 {% else %}
     {#
@@ -10,7 +10,7 @@
     append to
     #}
     <div{% if id is defined %} id="{{ id }}"
-        {%- endif %} {% if InitialSlidersState == 'closed' -%}
+        {%- endif %} {% if initial_sliders_state == 'closed' -%}
         style="display: none; overflow:auto;"{% endif %} class="pma_auto_slider"
         {%- if message is defined %} title="{{ message }}"{% endif %}>
 {% endif %}
diff --git a/templates/dropdown.twig b/templates/dropdown.twig
index 1a7743412a..6258ca773d 100644
--- a/templates/dropdown.twig
+++ b/templates/dropdown.twig
@@ -1,9 +1,10 @@
-<select name="{{ select_name }}"{% if id is not empty %} id="{{ id }}"{% endif %}{% if class is not empty %} class="{{ class }}"{% endif %}>
+<select name="{{ select_name }}"{% if id is not empty %} id="{{ id }}"{% endif -%}
+    {%- if class is not empty %} class="{{ class }}"{% endif %}>
 {% if placeholder is not empty %}
     <option value="" disabled="disabled"
     {%- if not selected %} selected="selected"{% endif %}>{{ placeholder }}</option>
 {% endif %}
-{% for option in resultOptions %}
+{% for option in result_options %}
 <option value="{{ option['value'] }}"
     {{- option['selected'] ? ' selected="selected"' }}>{{ option['label'] }}</option>
 {% endfor %}
diff --git a/templates/filter.twig b/templates/filter.twig
index 7ce690de63..572ec465ba 100644
--- a/templates/filter.twig
+++ b/templates/filter.twig
@@ -3,6 +3,6 @@
     <div class="formelement">
         <label for="filterText">{% trans "Containing the word:" %}</label>
         <input name="filterText" type="text" id="filterText"
-               value="{{ filterValue }}" />
+               value="{{ filter_value }}" />
     </div>
 </fieldset>
diff --git a/templates/prefs_autoload.twig b/templates/prefs_autoload.twig
index 83fac03d5c..511cfca298 100644
--- a/templates/prefs_autoload.twig
+++ b/templates/prefs_autoload.twig
@@ -1,6 +1,6 @@
 <div id="prefs_autoload" class="notice print_ignore" style="display:none">
     <form action="prefs_manage.php" method="post" class="disableAjax">
-        {{ hiddenInputs|raw }}
+        {{ hidden_inputs|raw }}
         <input type="hidden" name="json" value="" />
         <input type="hidden" name="submit_import" value="1" />
         <input type="hidden" name="return_url" value="{{ return_url }}" />
diff --git a/templates/select_all.twig b/templates/select_all.twig
index 1daba25128..b9c21021d7 100644
--- a/templates/select_all.twig
+++ b/templates/select_all.twig
@@ -1,6 +1,6 @@
-<img class="selectallarrow" src="{{ pmaThemeImage }}arrow_{{ text_dir }}.png"
+<img class="selectallarrow" src="{{ pma_theme_image }}arrow_{{ text_dir }}.png"
     width="38" height="22" alt="{% trans 'With selected:' %}" />
-<input type="checkbox" id="{{ formName }}_checkall" class="checkall_box"
+<input type="checkbox" id="{{ form_name }}_checkall" class="checkall_box"
     title="{% trans 'Check all' %}" />
-<label for="{{ formName }}_checkall">{% trans 'Check all' %}</label>
+<label for="{{ form_name }}_checkall">{% trans 'Check all' %}</label>
 <i style="margin-left: 2em">{% trans 'With selected:' %}</i>
diff --git a/templates/table/structure/check_all_table_column.phtml b/templates/table/structure/check_all_table_column.phtml
index d71fd97234..15bd90eb6a 100644
--- a/templates/table/structure/check_all_table_column.phtml
+++ b/templates/table/structure/check_all_table_column.phtml
@@ -2,9 +2,9 @@
     <?= PMA\libraries\Template::get('select_all')
             ->render(
                 array(
-                    'pmaThemeImage' => $pmaThemeImage,
-                    'text_dir'      => $text_dir,
-                    'formName'      => "fieldsForm",
+                    'pma_theme_image' => $pmaThemeImage,
+                    'text_dir'        => $text_dir,
+                    'form_name'       => "fieldsForm",
                 )
             ); ?>
     <?= PMA\libraries\Util::getButtonOrImage(
diff --git a/templates/toggle_button.twig b/templates/toggle_button.twig
index 050f18dd52..9e0a56a4e1 100644
--- a/templates/toggle_button.twig
+++ b/templates/toggle_button.twig
@@ -2,18 +2,18 @@
 <div class='wrapper toggleAjax hide'>
     <div class='toggleButton'>
         <div title="{% trans 'Click to toggle' %}" class='container {{ state }}'>
-            <img src="{{ pmaThemeImage }}toggle-{{ text_dir }}.png" alt='' />
+            <img src="{{ pma_theme_image }}toggle-{{ text_dir }}.png" alt='' />
             <table class='nospacing nopadding'>
                 <tbody>
                     <tr>
                         <td class='toggleOn'>
                             <span class='hide'>{{ link_on }}</span>
-                            <div>{{ toggleOn }}</div>
+                            <div>{{ toggle_on }}</div>
                         </td>
                         <td><div>&nbsp;</div></td>
                         <td class='toggleOff'>
                             <span class='hide'>{{ link_off }}</span>
-                            <div>{{ toggleOff }}</div>
+                            <div>{{ toggle_off }}</div>
                         </td>
                     </tr>
                 </tbody>