diff --git a/js/server_variables.js b/js/server_variables.js
index f6fcc989bc..829d8a6b3f 100644
--- a/js/server_variables.js
+++ b/js/server_variables.js
@@ -4,7 +4,7 @@
  * Unbind all event handlers before tearing down a page
  */
 AJAX.registerTeardown('server_variables.js', function() {
-    $('#serverVariables .variable_row').unbind('hover');
+    $('#serverVariables .var-row').unbind('hover');
     $('#filterText').unbind('keyup');
 });
 
@@ -17,9 +17,9 @@ AJAX.registerOnload('server_variables.js', function() {
     $cancelLink = $('a.cancelLink');
 
     /* Variable editing */
-    $('#serverVariables .variable_row').hover(
+    $('#serverVariables .var-row').hover(
         function() {
-            var $elm = $(this).find('.variable_value');
+            var $elm = $(this).find('.var-value');
             // Only add edit element if the element is not being edited
             if ($elm.hasClass('editable') && ! $elm.hasClass('edit')) {
                 $elm.prepend($editLink.clone().show());
@@ -51,7 +51,7 @@ AJAX.registerOnload('server_variables.js', function() {
     /* Filters the rows by the user given regexp */
     function filterVariables() {
         var mark_next = false, firstCell, odd_row = false;
-        $('#serverVariables .variable_row').not('.variable_header').each(function() {
+        $('#serverVariables .var-row').not('.var-header').each(function() {
             firstCell = $(this).children(':first');
             if (mark_next || textFilter == null || textFilter.exec(firstCell.text())) {
                 // If current global value is different from session value
@@ -77,7 +77,7 @@ AJAX.registerOnload('server_variables.js', function() {
 /* Called by inline js. Allows the user to edit a server variable */
 function editVariable(link)
 {
-    var varName = $(link).closest('.variable_row').find('.variable_name').text().replace(/ /g,'_');
+    var varName = $(link).closest('.var-row').find('.var-name').text().replace(/ /g,'_');
     var $mySaveLink = $saveLink.clone().show();
     var $myCancelLink = $cancelLink.clone().show();
     var $cell = $(link).parent();
diff --git a/server_variables.php b/server_variables.php
index 0777ddcf0d..bcd8f5b72e 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -152,9 +152,9 @@ $output .= '<fieldset id="tableFilter">'
     . '</fieldset>';
 
 $output .= '<div id="serverVariables" class="data filteredData noclick">'
-    . '<div class="variable_header variable_row">'
-    . '<div class="variable_name">' .  __('Variable') . '</div>'
-    . '<div class="variable_value valueHeader">'
+    . '<div class="var-header var-row">'
+    . '<div class="var-name">' .  __('Variable') . '</div>'
+    . '<div class="var-value valueHeader">'
     . __('Session value') . ' / ' . __('Global value')
     . '</div>'
     . '<div style="clear:both"></div>'
@@ -167,8 +167,8 @@ foreach ($serverVars as $name => $value) {
     $row_class = ($odd_row ? ' odd' : ' even')
         . ($has_session_value ? ' diffSession' : '');
 
-    $output .= '<div class="variable_row ' . $row_class . '">'
-        . '<div class="variable_name">';
+    $output .= '<div class="var-row ' . $row_class . '">'
+        . '<div class="var-name">';
 
     // To display variable documentation link
     if (isset($VARIABLE_DOC_LINKS[$name])) {
@@ -188,17 +188,17 @@ foreach ($serverVars as $name => $value) {
         $output .= htmlspecialchars(str_replace('_', ' ', $name));
     }
     $output .= '</div>'
-        . '<div class="variable_value value' . (PMA_isSuperuser() ? ' editable' : '') . '">&nbsp;'
+        . '<div class="var-value value' . (PMA_isSuperuser() ? ' editable' : '') . '">&nbsp;'
         . formatVariable($name, $value)
         . '</div>'
         . '<div style="clear:both"></div>'
         . '</div>';
 
     if ($has_session_value) {
-        $output .= '<div class="variable_row ' . ($odd_row ? ' odd' : ' even') . '">'
-            . '<div class="variable_name session">(' . __('Session value') . ')</div>'
-            . '<div class="variable_value value">&nbsp;' . formatVariable($name, $serverVarsSession[$name]) . '</div>'
-            . '<div class="variable_doc value"></div>'
+        $output .= '<div class="var-row ' . ($odd_row ? ' odd' : ' even') . '">'
+            . '<div class="var-name session">(' . __('Session value') . ')</div>'
+            . '<div class="var-value value">&nbsp;' . formatVariable($name, $serverVarsSession[$name]) . '</div>'
+            . '<div class="var-doc value"></div>'
             . '<div style="clear:both"></div>'
             . '</div>';
     }
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 1e621b9dad..a1a053848f 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -1164,34 +1164,34 @@ div#logTable table {
 #serverVariables {
     min-width: 30em;
 }
-#serverVariables .variable_row > div {
+#serverVariables .var-row > div {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 }
 
-#serverVariables .variable_header {
+#serverVariables .var-header {
     font-weight:        bold;
     color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
     background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
 }
-#serverVariables .variable_header .variable_value {
+#serverVariables .var-header .var-value {
     text-align: <?php echo $left; ?>;
 }
-#serverVariables .variable_row {
+#serverVariables .var-row {
     padding: 0.5em;
     min-height: 18px;
 }
-#serverVariables .variable_name {
+#serverVariables .var-name {
     width: 45%;
     float: <?php echo $left; ?>;
     font-weight: bold;
 }
-#serverVariables .variable_name.session {
+#serverVariables .var-name.session {
     font-weight: normal;
     font-style: italic;
 }
-#serverVariables .variable_value {
+#serverVariables .var-value {
     width: 50%;
     float: <?php echo $right; ?>;
     text-align: <?php echo $right; ?>;
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index c03bf394be..b900f7c68f 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -1432,39 +1432,39 @@ div#queryAnalyzerDialog table.queryNums {
 #serverVariables {
     min-width: 30em;
 }
-#serverVariables .variable_row > div {
+#serverVariables .var-row > div {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 }
-#serverVariables .variable_header {
+#serverVariables .var-header {
     color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
     background: #f3f3f3;
     <?php echo $_SESSION['PMA_Theme']->getCssGradient('ffffff', 'cccccc'); ?>
     font-weight: bold;
 }
-#serverVariables .variable_header .variable_value {
+#serverVariables .var-header .var-value {
     text-align: <?php echo $left; ?>;
 }
-#serverVariables .variable_row {
+#serverVariables .var-row {
     padding: 0.5em;
     min-height: 18px;
 }
-#serverVariables .variable_name {
+#serverVariables .var-name {
     width: 45%;
     float: <?php echo $left; ?>;
     font-weight: bold;
 }
-#serverVariables .variable_name.session {
+#serverVariables .var-name.session {
     font-weight: normal;
     font-style: italic;
 }
-#serverVariables .variable_value {
+#serverVariables .var-value {
     width: 50%;
     float: <?php echo $right; ?>;
     text-align: <?php echo $right; ?>;
 }
-#serverVariables .variable_doc {
+#serverVariables .var-doc {
     overflow:visible;
     float: <?php echo $right; ?>;
 }