diff --git a/PMAStandard/Sniffs/NamingConventions/ValidVariableNameSniff.php b/PMAStandard/Sniffs/NamingConventions/ValidVariableNameSniff.php
deleted file mode 100644
index 62b6dbe..0000000
--- a/PMAStandard/Sniffs/NamingConventions/ValidVariableNameSniff.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Checks the naming of variables and member variables.
- *
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- */
-namespace PhpMyAdmin\Sniffs\NamingConventions;
-
-use PHP_CodeSniffer\Standards\Zend\Sniffs\NamingConventions\ValidVariableNameSniff as ZendValidVariableNameSniff;
-use PHP_CodeSniffer\Util\Common;
-use PHP_CodeSniffer\Files\File;
-
-class ValidVariableNameSniff extends ZendValidVariableNameSniff
-{
-    /**
-     * Processes class member variables.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the current token in the
-     *                                               stack passed in $tokens.
-     *
-     * @return void
-     */
-    protected function processMemberVar(File $phpcsFile, $stackPtr)
-    {
-        $tokens      = $phpcsFile->getTokens();
-        $varName     = ltrim($tokens[$stackPtr]['content'], '$');
-        $memberProps = $phpcsFile->getMemberProperties($stackPtr);
-        if (empty($memberProps) === true) {
-            // Exception encountered.
-            return;
-        }
-
-        $public = ($memberProps['scope'] === 'public');
-
-        if (Common::isCamelCaps($varName, false, $public, false) === false) {
-            $error = 'Member variable "%s" is not in valid camel caps format';
-            $data  = [$varName];
-            $phpcsFile->addError($error, $stackPtr, 'MemberVarNotCamelCaps', $data);
-        } else if (preg_match('|\d|', $varName) === 1) {
-            $warning = 'Member variable "%s" contains numbers but this is discouraged';
-            $data    = [$varName];
-            $phpcsFile->addWarning($warning, $stackPtr, 'MemberVarContainsNumbers', $data);
-        }
-    }//end processMemberVar()
-}//end class
diff --git a/PMAStandard/ruleset.xml b/PMAStandard/ruleset.xml
index e95c0c7..8388b9d 100644
--- a/PMAStandard/ruleset.xml
+++ b/PMAStandard/ruleset.xml
@@ -35,4 +35,9 @@
             <property name="ignoreNewlines" value="true" />
         </properties>
     </rule>
+
+    <!-- Variable names should be camelCased with the first letter lowercase. -->
+    <rule ref="Zend.NamingConventions.ValidVariableName">
+        <exclude name="Zend.NamingConventions.ValidVariableName.PrivateNoUnderscore" />
+    </rule>
 </ruleset>
diff --git a/composer.json b/composer.json
index 5b7ca35..804c584 100644
--- a/composer.json
+++ b/composer.json
@@ -16,6 +16,6 @@
         "issues": "https://github.com/phpmyadmin/coding-standard/issues"
     },
     "require": {
-        "squizlabs/php_codesniffer": "^3.0"
+        "squizlabs/php_codesniffer": "^3.2.3"
     }
 }