diff --git a/WordPress-VIP-Go/ruleset.xml b/WordPress-VIP-Go/ruleset.xml
index 1eaa43ed..fddb8e5e 100644
--- a/WordPress-VIP-Go/ruleset.xml
+++ b/WordPress-VIP-Go/ruleset.xml
@@ -14,21 +14,21 @@
 		<type>error</type>
 		<message>File system writes only work in /tmp/ and inside the /uploads/ folder on VIP Go. To do filesystem writes you must use the WP_Filesystem class, using functions such as %s() won't work or will return unexpected results. Read more here: https://vip.wordpress.com/documentation/using-wp_filesystem-instead-of-direct-file-access-functions/</message>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.file_ops_fwrite">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.file_ops_fwrite">
 		<severity>6</severity>
 		<message>File system writes only work in /tmp/ and inside the /uploads/ folder on VIP Go. To do filesystem writes you must use the WP_Filesystem class, using functions such as %s() won't work or will return unexpected results. Read more here: https://vip.wordpress.com/documentation/using-wp_filesystem-instead-of-direct-file-access-functions/</message>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.cookies_setcookie">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.cookies_setcookie">
 		<type>error</type>
 		<severity>6</severity>
 		<message>Due to server-side caching, server-side based client related logic might not work. We recommend implementing client side logic in JavaScript instead.</message>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedVariables.cache_constraints___COOKIE">
+	<rule ref="WordPressVIPMinimum.Variables.RestrictedVariables.cache_constraints___COOKIE">
 		<type>error</type>
 		<severity>6</severity>
 		<message>Due to server-side caching, server-side based client related logic might not work. We recommend implementing client side logic in JavaScript instead.</message>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedVariables.cache_constraints___SERVER__HTTP_USER_AGENT__">
+	<rule ref="WordPressVIPMinimum.Variables.RestrictedVariables.cache_constraints___SERVER__HTTP_USER_AGENT__">
 		<type>error</type>
 		<severity>6</severity>
 		<message>Due to server-side caching, server-side based client related logic might not work. We recommend implementing client side logic in JavaScript instead.</message>
@@ -60,7 +60,7 @@
 	<rule ref="WordPressVIPMinimum.JS.HTMLExecutingFunctions.append">
 		<type>error</type>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.FetchingRemoteData.FileGetContentsUnknown">
+	<rule ref="WordPressVIPMinimum.Performance.FetchingRemoteData.FileGetContentsUnknown">
 		<type>error</type>
 		<message>%s() is uncached. If this is being used to query a remote file please use wpcom_vip_file_get_contents() instead. If it's used for a local file please use WP_Filesystem instead. Read more here: https://vip.wordpress.com/documentation/using-wp_filesystem-instead-of-direct-file-access-functions/</message>
 	</rule>
@@ -80,56 +80,56 @@
 	<rule ref="WordPress.WP.PostsPerPage.posts_per_page_posts_per_page">
 		<message>Having more than 100 posts returned per page can lead to severe performance problems.</message>
 	</rule>
-	<rule ref="WordPressVIPMinimum.Filters.RestrictedHook.UploadMimes">
+	<rule ref="WordPressVIPMinimum.Hooks.RestrictedHooks.UploadMimes">
 		<severity>10</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.PHPFilterFunctions.MissingSecondParameter">
+	<rule ref="WordPressVIPMinimum.Security.PHPFilterFunctions.MissingSecondParameter">
 		<severity>10</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.PHPFilterFunctions.MissingThirdParameter">
+	<rule ref="WordPressVIPMinimum.Security.PHPFilterFunctions.MissingThirdParameter">
 		<severity>10</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.PHPFilterFunctions.RestrictedFilter">
+	<rule ref="WordPressVIPMinimum.Security.PHPFilterFunctions.RestrictedFilter">
 		<severity>10</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.dbDelta_dbdelta">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.dbDelta_dbdelta">
 		<type>warning</type>
 		<severity>7</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.wp_mail_wp_mail">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.wp_mail_wp_mail">
 		<severity>7</severity>
 	</rule>
 
 
 	<!-- VIP Uncached warnings -->
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.attachment_url_to_postid_attachment_url_to_postid">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.attachment_url_to_postid_attachment_url_to_postid">
 		<type>warning</type>
 		<message>%s() is uncached, please use wpcom_vip_attachment_url_to_postid() instead.</message>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.get_adjacent_post_get_adjacent_post">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.get_adjacent_post_get_adjacent_post">
 		<type>warning</type>
 		<message>%s() is uncached, please use wpcom_vip_get_adjacent_post() instead.</message>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.get_page_by_title_get_page_by_title">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.get_page_by_title_get_page_by_title">
 		<type>warning</type>
 		<message>%s() is uncached, please use wpcom_vip_get_page_by_title() instead.</message>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.get_posts_get_children">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.get_posts_get_children">
 		<type>warning</type>
 		<severity>3</severity>
 		<message>%s() is uncached and performs a no limit query. Please use get_posts or WP_Query instead. More Info: https://vip.wordpress.com/documentation/vip-go/uncached-functions/</message>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.get_posts_get_posts">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.get_posts_get_posts">
 		<severity>3</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.get_posts_wp_get_recent_posts">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.get_posts_wp_get_recent_posts">
 		<severity>3</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.url_to_postid_url_to_postid">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.url_to_postid_url_to_postid">
 		<type>warning</type>
 		<message>%s() is uncached, please use wpcom_vip_url_to_postid() instead.</message>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.wp_old_slug_redirect_wp_old_slug_redirect">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.wp_old_slug_redirect_wp_old_slug_redirect">
 		<type>warning</type>
 		<message>%s() is uncached, please use wpcom_vip_old_slug_redirect() instead.</message>
 	</rule>
@@ -185,7 +185,7 @@
 		<severity>3</severity>
 		<message>Stylesheets must be registered/enqueued via `wp_enqueue_style`. This can improve the site's performance due to styles concatenation</message>
 	</rule>
-	<rule ref="WordPressVIPMinimum.Cache.LowExpiryCacheTime.LowCacheTime">
+	<rule ref="WordPressVIPMinimum.Performance.LowExpiryCacheTime.LowCacheTime">
 		<severity>3</severity>
 	</rule>
 	<rule ref="WordPressVIPMinimum.Files.IncludingFile">
@@ -198,10 +198,10 @@
 	<rule ref="WordPressVIPMinimum.Variables.VariableAnalysis.UnusedVariable">
 		<severity>1</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.AdminBarRemoval.HidingDetected">
+	<rule ref="WordPressVIPMinimum.UserExperience.AdminBarRemoval.HidingDetected">
 		<severity>3</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.AdminBarRemoval.RemovalDetected">
+	<rule ref="WordPressVIPMinimum.UserExperience.AdminBarRemoval.RemovalDetected">
 		<severity>3</severity>
 	</rule>
 	<rule ref="Generic.PHP.NoSilencedErrors.Forbidden">
@@ -210,19 +210,19 @@
 	<rule ref="Generic.PHP.NoSilencedErrors.Discouraged">
 		<severity>1</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.ProperEscapingFunction.htmlAttrNotByEscHTML">
+	<rule ref="WordPressVIPMinimum.Security.ProperEscapingFunction.htmlAttrNotByEscHTML">
 		<!-- This is still safe, just sub-optimal-->
 		<severity>3</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.is_multi_author_is_multi_author">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.is_multi_author_is_multi_author">
 		<severity>1</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.switch_to_blog_switch_to_blog">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.switch_to_blog_switch_to_blog">
 		<type>warning</type>
 		<severity>3</severity>
 		<message>Switch to blog may not work as you expect. It only changes the database context for the blog. It doesn't load the plugins or theme of that site. This means that filters or hooks that the blog you are switching to uses will not run.</message>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.WPQueryParams.PostNotIn">
+	<rule ref="WordPressVIPMinimum.Performance.WPQueryParams.PostNotIn">
 		<severity>3</severity>
 	</rule>
 
@@ -232,23 +232,23 @@
 		<!-- We are silencing this one because VIP Go has a combined index on meta_key, meta_value-->
 		<severity>0</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.Cache.BatcacheWhitelistedParams">
+	<rule ref="WordPressVIPMinimum.Performance.BatcacheWhitelistedParams">
 		<!-- We are silencing this one because VIP Go does not use Batcache-->
 		<severity>0</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.user_meta_add_user_meta">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.user_meta_add_user_meta">
 		<severity>0</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.user_meta_delete_user_meta">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.user_meta_delete_user_meta">
 		<severity>0</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.user_meta_get_user_meta">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.user_meta_get_user_meta">
 		<severity>0</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.user_meta_update_user_meta">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.user_meta_update_user_meta">
 		<severity>0</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedVariables.user_meta__wpdb__usermeta">
+	<rule ref="WordPressVIPMinimum.Variables.RestrictedVariables.user_meta__wpdb__usermeta">
 		<severity>0</severity>
 	</rule>
 
diff --git a/WordPressVIPMinimum/Sniffs/VIP/RobotstxtSniff.php b/WordPressVIPMinimum/Sniffs/Compatibility/RobotstxtSniff.php
similarity index 97%
rename from WordPressVIPMinimum/Sniffs/VIP/RobotstxtSniff.php
rename to WordPressVIPMinimum/Sniffs/Compatibility/RobotstxtSniff.php
index 72f8e9f1..ceea1816 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/RobotstxtSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Compatibility/RobotstxtSniff.php
@@ -7,7 +7,7 @@
  * @license https://github.com/Automattic/VIP-Coding-Standards/blob/master/LICENSE.md GPL v2 or later.
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Compatibility;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/WordPressVIPMinimum/Sniffs/Plugins/ZoninatorSniff.php b/WordPressVIPMinimum/Sniffs/Compatibility/ZoninatorSniff.php
similarity index 98%
rename from WordPressVIPMinimum/Sniffs/Plugins/ZoninatorSniff.php
rename to WordPressVIPMinimum/Sniffs/Compatibility/ZoninatorSniff.php
index 7df55a16..78a7e777 100644
--- a/WordPressVIPMinimum/Sniffs/Plugins/ZoninatorSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Compatibility/ZoninatorSniff.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Sniffs\Plugins;
+namespace WordPressVIPMinimum\Sniffs\Compatibility;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/WordPressVIPMinimum/Sniffs/Constants/ConstantRestrictionsSniff.php b/WordPressVIPMinimum/Sniffs/Constants/RestrictedConstantsSniff.php
similarity index 98%
rename from WordPressVIPMinimum/Sniffs/Constants/ConstantRestrictionsSniff.php
rename to WordPressVIPMinimum/Sniffs/Constants/RestrictedConstantsSniff.php
index 2d9e6bd3..6c2ac0fb 100644
--- a/WordPressVIPMinimum/Sniffs/Constants/ConstantRestrictionsSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Constants/RestrictedConstantsSniff.php
@@ -17,7 +17,7 @@
  *
  * @package VIPCS\WordPressVIPMinimum
  */
-class ConstantRestrictionsSniff implements Sniff {
+class RestrictedConstantsSniff implements Sniff {
 
 	/**
 	 * List of restricted constant names.
diff --git a/WordPressVIPMinimum/Sniffs/Functions/CreateFunctionSniff.php b/WordPressVIPMinimum/Sniffs/Functions/CreateFunctionSniff.php
deleted file mode 100644
index aca49a8d..00000000
--- a/WordPressVIPMinimum/Sniffs/Functions/CreateFunctionSniff.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * WordPressVIPMinimum Coding Standard.
- *
- * @package VIPCS\WordPressVIPMinimum
- */
-
-namespace WordPressVIPMinimum\Sniffs\Functions;
-
-use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Sniffs\Sniff;
-
-/**
- * This function generates an error when
- * create_function() is found in code.
- * create_function() is deprecated in PHP 7.2.0.
- *
- * An example:
- *
- * <code>
- *   create_function( 'foo', 'return "bar";' );
- * </code>
- *
- * See here: http://php.net/manual/en/function.create-function.php
- */
-class CreateFunctionSniff implements Sniff {
-	/**
-	 * Returns the token types that this sniff is interested in.
-	 *
-	 * We want everything function-related.
-	 *
-	 * @return array(int)
-	 */
-	public function register() {
-		return [ T_STRING ];
-	}
-
-	/**
-	 * Processes the tokens that this sniff is interested in.
-	 *
-	 * @param File $phpcsFile The PHP_CodeSniffer file where the token was found.
-	 * @param int  $stackPtr  The position in the stack where the token was found.
-	 *
-	 * @return void
-	 */
-	public function process( File $phpcsFile, $stackPtr ) {
-		$tokens = $phpcsFile->getTokens();
-
-		$functionName = $phpcsFile->findNext(
-			T_STRING,
-			( $stackPtr ),
-			null,
-			false,
-			null,
-			true
-		);
-
-		if ( 'create_function' !==
-			$tokens[ $stackPtr ]['content']
-		) {
-			return;
-		}
-
-		// Check if this is really a function.
-		$bracket = $phpcsFile->findNext(
-			T_WHITESPACE,
-			( $functionName + 1 ),
-			null,
-			true
-		);
-
-		if (
-			( false === $bracket ) ||
-			( T_OPEN_PARENTHESIS !== $tokens[ $bracket ]['code'] )
-		) {
-			return;
-		}
-
-		$message = 'create_function() is deprecated as of PHP 7.2.0.';
-		$phpcsFile->addError( $message, $functionName, 'CreateFunction' );
-	}
-}
diff --git a/WordPressVIPMinimum/Sniffs/VIP/RestrictedFunctionsSniff.php b/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php
similarity index 95%
rename from WordPressVIPMinimum/Sniffs/VIP/RestrictedFunctionsSniff.php
rename to WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php
index b052848c..7c5bab22 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/RestrictedFunctionsSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Functions;
 
 use WordPress\AbstractFunctionRestrictionsSniff;
 use WordPress\AbstractFunctionRestrictionSniff;
@@ -311,6 +311,13 @@ public function getGroups() {
 					'get_children',
 				],
 			],
+			'create_function' => [
+				'type'      => 'warning',
+				'message'   => '%s() is highly discouraged, as it can execute arbritary code (additionally, it\'s deprecated as of PHP 7.2): https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/#eval-and-create_function. )',
+				'functions' => [
+					'create_function',
+				],
+			],
 		];
 
 		$deprecated_vip_helpers = [
@@ -345,6 +352,12 @@ public function getGroups() {
 	public function is_targetted_token( $stackPtr ) {
 		// Exclude function definitions, class methods, and namespaced calls.
 		if ( \T_STRING === $this->tokens[ $stackPtr ]['code'] && isset( $this->tokens[ ( $stackPtr - 1 ) ] ) ) {
+			// Check if this is really a function.
+			$next = $this->phpcsFile->findNext( Tokens::$emptyTokens, ( $stackPtr + 1 ), null, true );
+			if ( false !== $next && T_OPEN_PARENTHESIS !== $this->tokens[ $next ]['code'] ) {
+				return false;
+			}
+
 			$prev = $this->phpcsFile->findPrevious( Tokens::$emptyTokens, ( $stackPtr - 1 ), null, true );
 			if ( false !== $prev ) {
 
diff --git a/WordPressVIPMinimum/Sniffs/Filters/AlwaysReturnSniff.php b/WordPressVIPMinimum/Sniffs/Hooks/AlwaysReturnInFilterSniff.php
similarity index 98%
rename from WordPressVIPMinimum/Sniffs/Filters/AlwaysReturnSniff.php
rename to WordPressVIPMinimum/Sniffs/Hooks/AlwaysReturnInFilterSniff.php
index 9205a51e..eebed41a 100644
--- a/WordPressVIPMinimum/Sniffs/Filters/AlwaysReturnSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Hooks/AlwaysReturnInFilterSniff.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Sniffs\Filters;
+namespace WordPressVIPMinimum\Sniffs\Hooks;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
@@ -16,7 +16,7 @@
  *
  * @package VIPCS\WordPressVIPMinimum
  */
-class AlwaysReturnSniff implements Sniff {
+class AlwaysReturnInFilterSniff implements Sniff {
 
 	/**
 	 * The tokens of the phpcsFile.
diff --git a/WordPressVIPMinimum/Sniffs/Actions/PreGetPostsSniff.php b/WordPressVIPMinimum/Sniffs/Hooks/PreGetPostsSniff.php
similarity index 99%
rename from WordPressVIPMinimum/Sniffs/Actions/PreGetPostsSniff.php
rename to WordPressVIPMinimum/Sniffs/Hooks/PreGetPostsSniff.php
index 285d2a73..09332c9e 100644
--- a/WordPressVIPMinimum/Sniffs/Actions/PreGetPostsSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Hooks/PreGetPostsSniff.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Sniffs\Actions;
+namespace WordPressVIPMinimum\Sniffs\Hooks;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/WordPressVIPMinimum/Sniffs/Filters/RestrictedHookSniff.php b/WordPressVIPMinimum/Sniffs/Hooks/RestrictedHooksSniff.php
similarity index 97%
rename from WordPressVIPMinimum/Sniffs/Filters/RestrictedHookSniff.php
rename to WordPressVIPMinimum/Sniffs/Hooks/RestrictedHooksSniff.php
index 04036168..28e7d34c 100644
--- a/WordPressVIPMinimum/Sniffs/Filters/RestrictedHookSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Hooks/RestrictedHooksSniff.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Sniffs\Filters;
+namespace WordPressVIPMinimum\Sniffs\Hooks;
 
 use WordPress\AbstractFunctionParameterSniff;
 
@@ -16,7 +16,7 @@
  *
  * @since 0.4.0
  */
-class RestrictedHookSniff extends AbstractFunctionParameterSniff {
+class RestrictedHooksSniff extends AbstractFunctionParameterSniff {
 
 	/**
 	 * The group name for this group of functions.
diff --git a/WordPressVIPMinimum/Sniffs/Cache/BatcacheWhitelistedParamsSniff.php b/WordPressVIPMinimum/Sniffs/Performance/BatcacheWhitelistedParamsSniff.php
similarity index 97%
rename from WordPressVIPMinimum/Sniffs/Cache/BatcacheWhitelistedParamsSniff.php
rename to WordPressVIPMinimum/Sniffs/Performance/BatcacheWhitelistedParamsSniff.php
index 9345a617..055e3880 100644
--- a/WordPressVIPMinimum/Sniffs/Cache/BatcacheWhitelistedParamsSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Performance/BatcacheWhitelistedParamsSniff.php
@@ -6,7 +6,7 @@
  * @link https://github.com/Automattic/VIP-Coding-Standards
  */
 
-namespace WordPressVIPMinimum\Sniffs\Cache;
+namespace WordPressVIPMinimum\Sniffs\Performance;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/WordPressVIPMinimum/Sniffs/Cache/CacheValueOverrideSniff.php b/WordPressVIPMinimum/Sniffs/Performance/CacheValueOverrideSniff.php
similarity index 98%
rename from WordPressVIPMinimum/Sniffs/Cache/CacheValueOverrideSniff.php
rename to WordPressVIPMinimum/Sniffs/Performance/CacheValueOverrideSniff.php
index b6905c5b..dd00a9f5 100644
--- a/WordPressVIPMinimum/Sniffs/Cache/CacheValueOverrideSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Performance/CacheValueOverrideSniff.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Sniffs\Cache;
+namespace WordPressVIPMinimum\Sniffs\Performance;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/WordPressVIPMinimum/Sniffs/VIP/FetchingRemoteDataSniff.php b/WordPressVIPMinimum/Sniffs/Performance/FetchingRemoteDataSniff.php
similarity index 97%
rename from WordPressVIPMinimum/Sniffs/VIP/FetchingRemoteDataSniff.php
rename to WordPressVIPMinimum/Sniffs/Performance/FetchingRemoteDataSniff.php
index 66ce6d6d..ced5e7b4 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/FetchingRemoteDataSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Performance/FetchingRemoteDataSniff.php
@@ -6,7 +6,7 @@
  * @link https://github.com/Automattic/VIP-Coding-Standards
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Performance;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/WordPressVIPMinimum/Sniffs/Cache/LowExpiryCacheTimeSniff.php b/WordPressVIPMinimum/Sniffs/Performance/LowExpiryCacheTimeSniff.php
similarity index 98%
rename from WordPressVIPMinimum/Sniffs/Cache/LowExpiryCacheTimeSniff.php
rename to WordPressVIPMinimum/Sniffs/Performance/LowExpiryCacheTimeSniff.php
index 08ebac75..d3bbdb63 100644
--- a/WordPressVIPMinimum/Sniffs/Cache/LowExpiryCacheTimeSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Performance/LowExpiryCacheTimeSniff.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Sniffs\Cache;
+namespace WordPressVIPMinimum\Sniffs\Performance;
 
 use WordPress\AbstractFunctionParameterSniff;
 
diff --git a/WordPressVIPMinimum/Sniffs/VIP/NoPagingSniff.php b/WordPressVIPMinimum/Sniffs/Performance/NoPagingSniff.php
similarity index 96%
rename from WordPressVIPMinimum/Sniffs/VIP/NoPagingSniff.php
rename to WordPressVIPMinimum/Sniffs/Performance/NoPagingSniff.php
index fcc44538..80bb6778 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/NoPagingSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Performance/NoPagingSniff.php
@@ -7,7 +7,7 @@
  * @license https://opensource.org/licenses/MIT MIT
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Performance;
 
 use WordPress\AbstractArrayAssignmentRestrictionsSniff;
 
diff --git a/WordPressVIPMinimum/Sniffs/VIP/OrderByRandSniff.php b/WordPressVIPMinimum/Sniffs/Performance/OrderByRandSniff.php
similarity index 96%
rename from WordPressVIPMinimum/Sniffs/VIP/OrderByRandSniff.php
rename to WordPressVIPMinimum/Sniffs/Performance/OrderByRandSniff.php
index b94ac9fc..76041e7b 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/OrderByRandSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Performance/OrderByRandSniff.php
@@ -7,7 +7,7 @@
  * @license https://opensource.org/licenses/MIT MIT
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Performance;
 
 use WordPress\AbstractArrayAssignmentRestrictionsSniff;
 
diff --git a/WordPressVIPMinimum/Sniffs/VIP/RegexpCompareSniff.php b/WordPressVIPMinimum/Sniffs/Performance/RegexpCompareSniff.php
similarity index 97%
rename from WordPressVIPMinimum/Sniffs/VIP/RegexpCompareSniff.php
rename to WordPressVIPMinimum/Sniffs/Performance/RegexpCompareSniff.php
index cdebaba6..7bfb6341 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/RegexpCompareSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Performance/RegexpCompareSniff.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Performance;
 
 /**
  * Flag REGEXP and NOT REGEXP in meta compare
diff --git a/WordPressVIPMinimum/Sniffs/VIP/RemoteRequestTimeoutSniff.php b/WordPressVIPMinimum/Sniffs/Performance/RemoteRequestTimeoutSniff.php
similarity index 96%
rename from WordPressVIPMinimum/Sniffs/VIP/RemoteRequestTimeoutSniff.php
rename to WordPressVIPMinimum/Sniffs/Performance/RemoteRequestTimeoutSniff.php
index 41efb5cc..8d77c035 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/RemoteRequestTimeoutSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Performance/RemoteRequestTimeoutSniff.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Performance;
 
 /**
  * Flag REGEXP and NOT REGEXP in meta compare
diff --git a/WordPressVIPMinimum/Sniffs/VIP/TaxonomyMetaInOptionsSniff.php b/WordPressVIPMinimum/Sniffs/Performance/TaxonomyMetaInOptionsSniff.php
similarity index 98%
rename from WordPressVIPMinimum/Sniffs/VIP/TaxonomyMetaInOptionsSniff.php
rename to WordPressVIPMinimum/Sniffs/Performance/TaxonomyMetaInOptionsSniff.php
index 6a680ab1..e08d5171 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/TaxonomyMetaInOptionsSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Performance/TaxonomyMetaInOptionsSniff.php
@@ -6,7 +6,7 @@
  * @link https://github.com/Automattic/VIP-Coding-Standards
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Performance;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/WordPressVIPMinimum/Sniffs/VIP/WPQueryParamsSniff.php b/WordPressVIPMinimum/Sniffs/Performance/WPQueryParamsSniff.php
similarity index 97%
rename from WordPressVIPMinimum/Sniffs/VIP/WPQueryParamsSniff.php
rename to WordPressVIPMinimum/Sniffs/Performance/WPQueryParamsSniff.php
index be2cf469..bb9aaf7d 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/WPQueryParamsSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Performance/WPQueryParamsSniff.php
@@ -6,7 +6,7 @@
  * @link https://github.com/Automattic/VIP-Coding-Standards
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Performance;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/WordPressVIPMinimum/Sniffs/VIP/EscapingVoidReturnFunctionsSniff.php b/WordPressVIPMinimum/Sniffs/Security/EscapingVoidReturnFunctionsSniff.php
similarity index 97%
rename from WordPressVIPMinimum/Sniffs/VIP/EscapingVoidReturnFunctionsSniff.php
rename to WordPressVIPMinimum/Sniffs/Security/EscapingVoidReturnFunctionsSniff.php
index 188d3e4a..3290313d 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/EscapingVoidReturnFunctionsSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Security/EscapingVoidReturnFunctionsSniff.php
@@ -6,7 +6,7 @@
  * @link https://github.com/Automattic/VIP-Coding-Standards
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Security;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/WordPressVIPMinimum/Sniffs/VIP/ExitAfterRedirectSniff.php b/WordPressVIPMinimum/Sniffs/Security/ExitAfterRedirectSniff.php
similarity index 97%
rename from WordPressVIPMinimum/Sniffs/VIP/ExitAfterRedirectSniff.php
rename to WordPressVIPMinimum/Sniffs/Security/ExitAfterRedirectSniff.php
index 5fba97e5..fa801553 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/ExitAfterRedirectSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Security/ExitAfterRedirectSniff.php
@@ -6,7 +6,7 @@
  * @link https://github.com/Automattic/VIP-Coding-Standards
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Security;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/WordPressVIPMinimum/Sniffs/TemplatingEngines/UnescapedOutputMustacheSniff.php b/WordPressVIPMinimum/Sniffs/Security/MustacheSniff.php
similarity index 89%
rename from WordPressVIPMinimum/Sniffs/TemplatingEngines/UnescapedOutputMustacheSniff.php
rename to WordPressVIPMinimum/Sniffs/Security/MustacheSniff.php
index 69c7cc1d..7d5752f6 100644
--- a/WordPressVIPMinimum/Sniffs/TemplatingEngines/UnescapedOutputMustacheSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Security/MustacheSniff.php
@@ -1,23 +1,22 @@
 <?php
 /**
- * WordPressVIPMinimum_Sniffs_TemplatingEngines_UnescapedOutputMustacheSniff.
+ * WordPressVIPMinimum Coding Standard.
  *
  * @package VIPCS\WordPressVIPMinimum
+ * @link https://github.com/Automattic/VIP-Coding-Standards
  */
 
-namespace WordPressVIPMinimum\Sniffs\TemplatingEngines;
+namespace WordPressVIPMinimum\Sniffs\Security;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
- * WordPressVIPMinimum_Sniffs_TemplatingEngines_UnescapedOutputMustacheSniff.
- *
  * Looks for instances of unescaped output for Mustache templating engine and Handlebars.js.
  *
  * @package VIPCS\WordPressVIPMinimum
  */
-class UnescapedOutputMustacheSniff implements Sniff {
+class MustacheSniff implements Sniff {
 
 	/**
 	 * A list of tokenizers this sniff supports.
diff --git a/WordPressVIPMinimum/Sniffs/VIP/PHPFilterFunctionsSniff.php b/WordPressVIPMinimum/Sniffs/Security/PHPFilterFunctionsSniff.php
similarity index 98%
rename from WordPressVIPMinimum/Sniffs/VIP/PHPFilterFunctionsSniff.php
rename to WordPressVIPMinimum/Sniffs/Security/PHPFilterFunctionsSniff.php
index f7a95d9f..9d17ed9e 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/PHPFilterFunctionsSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Security/PHPFilterFunctionsSniff.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Security;
 
 use WordPress\AbstractFunctionParameterSniff;
 
diff --git a/WordPressVIPMinimum/Sniffs/VIP/ProperEscapingFunctionSniff.php b/WordPressVIPMinimum/Sniffs/Security/ProperEscapingFunctionSniff.php
similarity index 99%
rename from WordPressVIPMinimum/Sniffs/VIP/ProperEscapingFunctionSniff.php
rename to WordPressVIPMinimum/Sniffs/Security/ProperEscapingFunctionSniff.php
index e1a4062a..b6e0749a 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/ProperEscapingFunctionSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Security/ProperEscapingFunctionSniff.php
@@ -6,7 +6,7 @@
  * @link https://github.com/Automattic/VIP-Coding-Standards
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Security;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/WordPressVIPMinimum/Sniffs/VIP/StaticStrreplaceSniff.php b/WordPressVIPMinimum/Sniffs/Security/StaticStrreplaceSniff.php
similarity index 98%
rename from WordPressVIPMinimum/Sniffs/VIP/StaticStrreplaceSniff.php
rename to WordPressVIPMinimum/Sniffs/Security/StaticStrreplaceSniff.php
index 19b4e58c..627f484d 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/StaticStrreplaceSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Security/StaticStrreplaceSniff.php
@@ -6,7 +6,7 @@
  * @link https://github.com/Automattic/VIP-Coding-Standards
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Security;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/WordPressVIPMinimum/Sniffs/TemplatingEngines/UnescapedOutputTwigSniff.php b/WordPressVIPMinimum/Sniffs/Security/TwigSniff.php
similarity index 84%
rename from WordPressVIPMinimum/Sniffs/TemplatingEngines/UnescapedOutputTwigSniff.php
rename to WordPressVIPMinimum/Sniffs/Security/TwigSniff.php
index a04fdea9..4648696d 100644
--- a/WordPressVIPMinimum/Sniffs/TemplatingEngines/UnescapedOutputTwigSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Security/TwigSniff.php
@@ -1,23 +1,22 @@
 <?php
 /**
- * WordPressVIPMinimum_Sniffs_TemplatingEngines_UnescapedOutputTwigSniff.
+ * WordPressVIPMinimum Coding Standard.
  *
  * @package VIPCS\WordPressVIPMinimum
+ * @link https://github.com/Automattic/VIP-Coding-Standards
  */
 
-namespace WordPressVIPMinimum\Sniffs\TemplatingEngines;
+namespace WordPressVIPMinimum\Sniffs\Security;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
- * WordPressVIPMinimum_Sniffs_TemplatingEngines_UnescapedOutputTwigSniff.
- *
  * Looks for instances of unescaped output for Twig templating engine.
  *
  * @package VIPCS\WordPressVIPMinimum
  */
-class UnescapedOutputTwigSniff implements Sniff {
+class TwigSniff implements Sniff {
 
 	/**
 	 * A list of tokenizers this sniff supports.
diff --git a/WordPressVIPMinimum/Sniffs/TemplatingEngines/UnescapedOutputUnderscorejsSniff.php b/WordPressVIPMinimum/Sniffs/Security/UnderscorejsSniff.php
similarity index 84%
rename from WordPressVIPMinimum/Sniffs/TemplatingEngines/UnescapedOutputUnderscorejsSniff.php
rename to WordPressVIPMinimum/Sniffs/Security/UnderscorejsSniff.php
index 57a576a1..785878dd 100644
--- a/WordPressVIPMinimum/Sniffs/TemplatingEngines/UnescapedOutputUnderscorejsSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Security/UnderscorejsSniff.php
@@ -1,23 +1,22 @@
 <?php
 /**
- * WordPressVIPMinimum_Sniffs_TemplatingEngines_UnescapedOutputUnderscorejsSniff.
+ * WordPressVIPMinimum Coding Standard.
  *
  * @package VIPCS\WordPressVIPMinimum
+ * @link https://github.com/Automattic/VIP-Coding-Standards
  */
 
-namespace WordPressVIPMinimum\Sniffs\TemplatingEngines;
+namespace WordPressVIPMinimum\Sniffs\Security;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
- * WordPressVIPMinimum_Sniffs_TemplatingEngines_UnescapedOutputUnderscorejsSniff.
- *
  * Looks for instances of unescaped output for Underscore.js templating engine.
  *
  * @package VIPCS\WordPressVIPMinimum
  */
-class UnescapedOutputUnderscorejsSniff implements Sniff {
+class UnderscorejsSniff implements Sniff {
 
 	/**
 	 * A list of tokenizers this sniff supports.
diff --git a/WordPressVIPMinimum/Sniffs/TemplatingEngines/UnescapedOutputVuejsSniff.php b/WordPressVIPMinimum/Sniffs/Security/VuejsSniff.php
similarity index 82%
rename from WordPressVIPMinimum/Sniffs/TemplatingEngines/UnescapedOutputVuejsSniff.php
rename to WordPressVIPMinimum/Sniffs/Security/VuejsSniff.php
index ab9a0abc..81c198fe 100644
--- a/WordPressVIPMinimum/Sniffs/TemplatingEngines/UnescapedOutputVuejsSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Security/VuejsSniff.php
@@ -1,23 +1,22 @@
 <?php
 /**
- * WordPressVIPMinimum_Sniffs_TemplatingEngines_UnescapedOutputTwigSniff.
+ * WordPressVIPMinimum Coding Standard.
  *
  * @package VIPCS\WordPressVIPMinimum
+ * @link https://github.com/Automattic/VIP-Coding-Standards
  */
 
-namespace WordPressVIPMinimum\Sniffs\TemplatingEngines;
+namespace WordPressVIPMinimum\Sniffs\Security;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
- * WordPressVIPMinimum_Sniffs_TemplatingEngines_UnescapedOutputVuejsSniff.
- *
  * Looks for instances of unescaped output for Twig templating engine.
  *
  * @package VIPCS\WordPressVIPMinimum
  */
-class UnescapedOutputVuejsSniff implements Sniff {
+class VuejsSniff implements Sniff {
 
 	/**
 	 * A list of tokenizers this sniff supports.
diff --git a/WordPressVIPMinimum/Sniffs/VIP/AdminBarRemovalSniff.php b/WordPressVIPMinimum/Sniffs/UserExperience/AdminBarRemovalSniff.php
similarity index 99%
rename from WordPressVIPMinimum/Sniffs/VIP/AdminBarRemovalSniff.php
rename to WordPressVIPMinimum/Sniffs/UserExperience/AdminBarRemovalSniff.php
index 1ec6ed29..eeb39199 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/AdminBarRemovalSniff.php
+++ b/WordPressVIPMinimum/Sniffs/UserExperience/AdminBarRemovalSniff.php
@@ -7,7 +7,7 @@
  * @license https://opensource.org/licenses/MIT MIT
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\UserExperience;
 
 use WordPress\AbstractFunctionParameterSniff;
 use PHP_CodeSniffer_Tokens as Tokens;
diff --git a/WordPressVIPMinimum/Sniffs/VIP/RestrictedVariablesSniff.php b/WordPressVIPMinimum/Sniffs/Variables/RestrictedVariablesSniff.php
similarity index 97%
rename from WordPressVIPMinimum/Sniffs/VIP/RestrictedVariablesSniff.php
rename to WordPressVIPMinimum/Sniffs/Variables/RestrictedVariablesSniff.php
index e644973a..7b6d7917 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/RestrictedVariablesSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Variables/RestrictedVariablesSniff.php
@@ -7,7 +7,7 @@
  * @license https://opensource.org/licenses/MIT MIT
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Variables;
 
 use WordPressVIPMinimum\Sniffs\AbstractVariableRestrictionsSniff;
 
diff --git a/WordPressVIPMinimum/Sniffs/VIP/MergeConflictSniff.php b/WordPressVIPMinimum/Sniffs/VersionControl/MergeConflictSniff.php
similarity index 98%
rename from WordPressVIPMinimum/Sniffs/VIP/MergeConflictSniff.php
rename to WordPressVIPMinimum/Sniffs/VersionControl/MergeConflictSniff.php
index d44761f1..11c86b03 100644
--- a/WordPressVIPMinimum/Sniffs/VIP/MergeConflictSniff.php
+++ b/WordPressVIPMinimum/Sniffs/VersionControl/MergeConflictSniff.php
@@ -6,7 +6,7 @@
  * @link https://github.com/Automattic/VIP-Coding-Standards
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\VersionControl;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
diff --git a/WordPressVIPMinimum/Tests/VIP/RobotstxtSniff.inc b/WordPressVIPMinimum/Tests/Compatibility/RobotstxtSniff.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/VIP/RobotstxtSniff.inc
rename to WordPressVIPMinimum/Tests/Compatibility/RobotstxtSniff.inc
diff --git a/WordPressVIPMinimum/Tests/VIP/RobotstxtSniff.php b/WordPressVIPMinimum/Tests/Compatibility/RobotstxtSniff.php
similarity index 94%
rename from WordPressVIPMinimum/Tests/VIP/RobotstxtSniff.php
rename to WordPressVIPMinimum/Tests/Compatibility/RobotstxtSniff.php
index 4bdbcb4b..566ff4d0 100644
--- a/WordPressVIPMinimum/Tests/VIP/RobotstxtSniff.php
+++ b/WordPressVIPMinimum/Tests/Compatibility/RobotstxtSniff.php
@@ -7,7 +7,7 @@
  * @license https://github.com/Automattic/VIP-Coding-Standards/blob/master/LICENSE.md GPL v2 or later.
  */
 
-namespace WordPressVIPMinimum\Sniffs\VIP;
+namespace WordPressVIPMinimum\Sniffs\Compatibility;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/Plugins/ZoninatorUnitTest.inc b/WordPressVIPMinimum/Tests/Compatibility/ZoninatorUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/Plugins/ZoninatorUnitTest.inc
rename to WordPressVIPMinimum/Tests/Compatibility/ZoninatorUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/Plugins/ZoninatorUnitTest.php b/WordPressVIPMinimum/Tests/Compatibility/ZoninatorUnitTest.php
similarity index 93%
rename from WordPressVIPMinimum/Tests/Plugins/ZoninatorUnitTest.php
rename to WordPressVIPMinimum/Tests/Compatibility/ZoninatorUnitTest.php
index 86d1f5dc..fdec45eb 100644
--- a/WordPressVIPMinimum/Tests/Plugins/ZoninatorUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Compatibility/ZoninatorUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\Plugins;
+namespace WordPressVIPMinimum\Tests\Compatibility;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/Constants/ConstantRestrictionsUnitTest.inc b/WordPressVIPMinimum/Tests/Constants/RestrictedConstantsUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/Constants/ConstantRestrictionsUnitTest.inc
rename to WordPressVIPMinimum/Tests/Constants/RestrictedConstantsUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/Constants/ConstantRestrictionsUnitTest.php b/WordPressVIPMinimum/Tests/Constants/RestrictedConstantsUnitTest.php
similarity index 91%
rename from WordPressVIPMinimum/Tests/Constants/ConstantRestrictionsUnitTest.php
rename to WordPressVIPMinimum/Tests/Constants/RestrictedConstantsUnitTest.php
index 140c846b..7999e997 100644
--- a/WordPressVIPMinimum/Tests/Constants/ConstantRestrictionsUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Constants/RestrictedConstantsUnitTest.php
@@ -14,7 +14,7 @@
  *
  * @package VIPCS\WordPressVIPMinimum
  */
-class ConstantRestrictionsUnitTest extends AbstractSniffUnitTest {
+class RestrictedConstantsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPressVIPMinimum/Tests/Functions/CreateFunctionSniff.inc b/WordPressVIPMinimum/Tests/Functions/CreateFunctionSniff.inc
deleted file mode 100644
index 068c2a1d..00000000
--- a/WordPressVIPMinimum/Tests/Functions/CreateFunctionSniff.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-$a = time();
-$b = time() * 2;
-
-/*
- * Test for true positive
- */
-$wp_random_testing = create_function( '$a, $b', 'return ( $b / $a ); ');
-
-
-/*
- * Test for false positives
- */
-
-echo esc_html( $wp_random_testing( $a, $b ) );
-
-class Foo {
-    public create_function = 'foo';
-}
-$c = new Foo();
-$c->create_function = 'bar' . ( 1 === 1 ?? 'foo' );
-
-$m = bla_function( '$a, $b', 'return ( $b / $a ); ');
-
-$wp_random_testing = 
-   create_function2( '$a, $b', 'return ( $b / $a ); ');
-
-$wp_random_testing = 
-   create_function3( '$a, $b', 'return ( $b / $a ); ');
-
diff --git a/WordPressVIPMinimum/Tests/Functions/CreateFunctionSniff.php b/WordPressVIPMinimum/Tests/Functions/CreateFunctionSniff.php
deleted file mode 100644
index 08e7eba6..00000000
--- a/WordPressVIPMinimum/Tests/Functions/CreateFunctionSniff.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Unit test class for WordPressVIPMinimum Coding Standard.
- *
- * @package VIPCS\WordPressVIPMinimum
- */
-
-namespace WordPressVIPMinimum\Tests\Functions;
-
-use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
-
-/**
- * Unit test class for the CheckReturnValue sniff.
- *
- * @package VIPCS\WordPressVIPMinimum
- */
-class CreateFunctionUnitTest extends AbstractSniffUnitTest {
-
-	/**
-	 * Returns the lines where errors should occur.
-	 *
-	 * @return array <int line number> => <int number of errors>
-	 */
-	public function getErrorList() {
-		return [
-			9 => 1,
-		];
-	}
-
-	/**
-	 * Returns the lines where warnings should occur.
-	 *
-	 * @return array <int line number> => <int number of warnings>
-	 */
-	public function getWarningList() {
-		return [];
-	}
-
-}
diff --git a/WordPressVIPMinimum/Tests/VIP/RestrictedFunctionsUnitTest.inc b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc
similarity index 94%
rename from WordPressVIPMinimum/Tests/VIP/RestrictedFunctionsUnitTest.inc
rename to WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc
index 0ea05a13..cdab7cd5 100644
--- a/WordPressVIPMinimum/Tests/VIP/RestrictedFunctionsUnitTest.inc
+++ b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc
@@ -202,3 +202,16 @@ lchown(); // Error.
 use Fieldmanager_Link as Link; // Ok.
 namespace Fieldmanager\Link\Something; // Ok.
 namespace Fieldmanager\Link; // Ok.
+
+$a = time();
+$b = time() * 2;
+$wp_random_testing = create_function( '$a, $b', 'return ( $b / $a ); '); // Warning.
+
+class Foo {
+    public create_function = 'foo'; // Ok.
+}
+$c = new Foo();
+$c->create_function = 'bar' . ( 1 === 1 ?? 'foo' ); // Ok.
+$wp_random_testing = create_function2( '$a, $b', 'return ( $b / $a ); '); // Ok.
+$wp_random_testing = create_function3( '$a, $b', 'return ( $b / $a ); '); // Ok.
+
diff --git a/WordPressVIPMinimum/Tests/VIP/RestrictedFunctionsUnitTest.php b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php
similarity index 97%
rename from WordPressVIPMinimum/Tests/VIP/RestrictedFunctionsUnitTest.php
rename to WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php
index 7627accd..02c5ec2c 100644
--- a/WordPressVIPMinimum/Tests/VIP/RestrictedFunctionsUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\VIP;
+namespace WordPressVIPMinimum\Tests\Functions;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
@@ -129,6 +129,7 @@ public function getWarningList() {
 			137 => 1,
 			138 => 1,
 			139 => 1,
+			208 => 1,
 		];
 	}
 
diff --git a/WordPressVIPMinimum/Tests/Filters/AlwaysReturnUnitTest.inc b/WordPressVIPMinimum/Tests/Hooks/AlwaysReturnInFilterUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/Filters/AlwaysReturnUnitTest.inc
rename to WordPressVIPMinimum/Tests/Hooks/AlwaysReturnInFilterUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/Filters/AlwaysReturnUnitTest.php b/WordPressVIPMinimum/Tests/Hooks/AlwaysReturnInFilterUnitTest.php
similarity index 80%
rename from WordPressVIPMinimum/Tests/Filters/AlwaysReturnUnitTest.php
rename to WordPressVIPMinimum/Tests/Hooks/AlwaysReturnInFilterUnitTest.php
index 6617d69d..41339fa6 100644
--- a/WordPressVIPMinimum/Tests/Filters/AlwaysReturnUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Hooks/AlwaysReturnInFilterUnitTest.php
@@ -5,15 +5,15 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\Filters;
+namespace WordPressVIPMinimum\Tests\Hooks;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 /**
- * Unit test class for the Filters/AlwaysReturn sniff.
+ * Unit test class for the Hooks/AlwaysReturn sniff.
  *
  * @package VIPCS\WordPressVIPMinimum
  */
-class AlwaysReturnUnitTest extends AbstractSniffUnitTest {
+class AlwaysReturnInFilterUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPressVIPMinimum/Tests/Actions/PreGetPostsUnitTest.inc b/WordPressVIPMinimum/Tests/Hooks/PreGetPostsUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/Actions/PreGetPostsUnitTest.inc
rename to WordPressVIPMinimum/Tests/Hooks/PreGetPostsUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/Actions/PreGetPostsUnitTest.php b/WordPressVIPMinimum/Tests/Hooks/PreGetPostsUnitTest.php
similarity index 94%
rename from WordPressVIPMinimum/Tests/Actions/PreGetPostsUnitTest.php
rename to WordPressVIPMinimum/Tests/Hooks/PreGetPostsUnitTest.php
index 62986357..058f2d6b 100644
--- a/WordPressVIPMinimum/Tests/Actions/PreGetPostsUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Hooks/PreGetPostsUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\Actions;
+namespace WordPressVIPMinimum\Tests\Hooks;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/Filters/RestrictedHookUnitTest.inc b/WordPressVIPMinimum/Tests/Hooks/RestrictedHooksUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/Filters/RestrictedHookUnitTest.inc
rename to WordPressVIPMinimum/Tests/Hooks/RestrictedHooksUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/Filters/RestrictedHookUnitTest.php b/WordPressVIPMinimum/Tests/Hooks/RestrictedHooksUnitTest.php
similarity index 82%
rename from WordPressVIPMinimum/Tests/Filters/RestrictedHookUnitTest.php
rename to WordPressVIPMinimum/Tests/Hooks/RestrictedHooksUnitTest.php
index f1e85fe2..60c14dca 100644
--- a/WordPressVIPMinimum/Tests/Filters/RestrictedHookUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Hooks/RestrictedHooksUnitTest.php
@@ -5,17 +5,17 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\Filters;
+namespace WordPressVIPMinimum\Tests\Hooks;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 /**
- * Unit test class for the Filters/RestrictedHook sniff.
+ * Unit test class for the Filters/RestrictedHooks sniff.
  *
  * @package VIPCS\WordPressVIPMinimum
  *
  * @since 0.4.0
  */
-class RestrictedHookUnitTest extends AbstractSniffUnitTest {
+class RestrictedHooksUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPressVIPMinimum/Tests/Cache/BatcacheWhitelistedParamsUnitTest.inc b/WordPressVIPMinimum/Tests/Performance/BatcacheWhitelistedParamsUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/Cache/BatcacheWhitelistedParamsUnitTest.inc
rename to WordPressVIPMinimum/Tests/Performance/BatcacheWhitelistedParamsUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/Cache/BatcacheWhitelistedParamsUnitTest.php b/WordPressVIPMinimum/Tests/Performance/BatcacheWhitelistedParamsUnitTest.php
similarity index 93%
rename from WordPressVIPMinimum/Tests/Cache/BatcacheWhitelistedParamsUnitTest.php
rename to WordPressVIPMinimum/Tests/Performance/BatcacheWhitelistedParamsUnitTest.php
index a356987a..9867a2c0 100644
--- a/WordPressVIPMinimum/Tests/Cache/BatcacheWhitelistedParamsUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Performance/BatcacheWhitelistedParamsUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\Cache;
+namespace WordPressVIPMinimum\Tests\Performance;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/Cache/CacheValueOverrideUnitTest.inc b/WordPressVIPMinimum/Tests/Performance/CacheValueOverrideUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/Cache/CacheValueOverrideUnitTest.inc
rename to WordPressVIPMinimum/Tests/Performance/CacheValueOverrideUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/Cache/CacheValueOverrideUnitTest.php b/WordPressVIPMinimum/Tests/Performance/CacheValueOverrideUnitTest.php
similarity index 93%
rename from WordPressVIPMinimum/Tests/Cache/CacheValueOverrideUnitTest.php
rename to WordPressVIPMinimum/Tests/Performance/CacheValueOverrideUnitTest.php
index ff976f1b..91ba18ed 100644
--- a/WordPressVIPMinimum/Tests/Cache/CacheValueOverrideUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Performance/CacheValueOverrideUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\Cache;
+namespace WordPressVIPMinimum\Tests\Performance;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/VIP/FetchingRemoteDataUnitTest.inc b/WordPressVIPMinimum/Tests/Performance/FetchingRemoteDataUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/VIP/FetchingRemoteDataUnitTest.inc
rename to WordPressVIPMinimum/Tests/Performance/FetchingRemoteDataUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/VIP/FetchingRemoteDataUnitTest.php b/WordPressVIPMinimum/Tests/Performance/FetchingRemoteDataUnitTest.php
similarity index 93%
rename from WordPressVIPMinimum/Tests/VIP/FetchingRemoteDataUnitTest.php
rename to WordPressVIPMinimum/Tests/Performance/FetchingRemoteDataUnitTest.php
index 00e82169..fa4a8551 100644
--- a/WordPressVIPMinimum/Tests/VIP/FetchingRemoteDataUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Performance/FetchingRemoteDataUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\VIP;
+namespace WordPressVIPMinimum\Tests\Performance;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/Cache/LowExpiryCacheTimeUnitTest.inc b/WordPressVIPMinimum/Tests/Performance/LowExpiryCacheTimeUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/Cache/LowExpiryCacheTimeUnitTest.inc
rename to WordPressVIPMinimum/Tests/Performance/LowExpiryCacheTimeUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/Cache/LowExpiryCacheTimeUnitTest.php b/WordPressVIPMinimum/Tests/Performance/LowExpiryCacheTimeUnitTest.php
similarity index 94%
rename from WordPressVIPMinimum/Tests/Cache/LowExpiryCacheTimeUnitTest.php
rename to WordPressVIPMinimum/Tests/Performance/LowExpiryCacheTimeUnitTest.php
index acd6e3c1..6befe13e 100644
--- a/WordPressVIPMinimum/Tests/Cache/LowExpiryCacheTimeUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Performance/LowExpiryCacheTimeUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\Cache;
+namespace WordPressVIPMinimum\Tests\Performance;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/VIP/NoPagingUnitTest.inc b/WordPressVIPMinimum/Tests/Performance/NoPagingUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/VIP/NoPagingUnitTest.inc
rename to WordPressVIPMinimum/Tests/Performance/NoPagingUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/VIP/NoPagingUnitTest.php b/WordPressVIPMinimum/Tests/Performance/NoPagingUnitTest.php
similarity index 93%
rename from WordPressVIPMinimum/Tests/VIP/NoPagingUnitTest.php
rename to WordPressVIPMinimum/Tests/Performance/NoPagingUnitTest.php
index cd735a43..b37f11c2 100644
--- a/WordPressVIPMinimum/Tests/VIP/NoPagingUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Performance/NoPagingUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\VIP;
+namespace WordPressVIPMinimum\Tests\Performance;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/VIP/OrderByRandUnitTest.inc b/WordPressVIPMinimum/Tests/Performance/OrderByRandUnitTest.inc
similarity index 65%
rename from WordPressVIPMinimum/Tests/VIP/OrderByRandUnitTest.inc
rename to WordPressVIPMinimum/Tests/Performance/OrderByRandUnitTest.inc
index 5ff651ce..1fac81b3 100644
--- a/WordPressVIPMinimum/Tests/VIP/OrderByRandUnitTest.inc
+++ b/WordPressVIPMinimum/Tests/Performance/OrderByRandUnitTest.inc
@@ -12,7 +12,7 @@ $query_args['orderby'] = 'rand'; // Bad.
 
 $query_args['orderby'] = 'date'; // Ok.
 
-// phpcs:set WordPress.VIP.OrderByRand exclude something
+// phpcs:set WordPressVIPMinimum.Performance.OrderByRand exclude something
 $query_args['orderby'] = 'rand'; // Bad.
 
-// phpcs:set WordPress.VIP.OrderByRand exclude false
+// phpcs:set WordPressVIPMinimum.Performance.OrderByRand exclude false
diff --git a/WordPressVIPMinimum/Tests/VIP/OrderByRandUnitTest.php b/WordPressVIPMinimum/Tests/Performance/OrderByRandUnitTest.php
similarity index 94%
rename from WordPressVIPMinimum/Tests/VIP/OrderByRandUnitTest.php
rename to WordPressVIPMinimum/Tests/Performance/OrderByRandUnitTest.php
index 7f051923..f17cd8be 100644
--- a/WordPressVIPMinimum/Tests/VIP/OrderByRandUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Performance/OrderByRandUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\VIP;
+namespace WordPressVIPMinimum\Tests\Performance;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/VIP/RegexpCompareUnitTest.inc b/WordPressVIPMinimum/Tests/Performance/RegexpCompareUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/VIP/RegexpCompareUnitTest.inc
rename to WordPressVIPMinimum/Tests/Performance/RegexpCompareUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/VIP/RegexpCompareUnitTest.php b/WordPressVIPMinimum/Tests/Performance/RegexpCompareUnitTest.php
similarity index 93%
rename from WordPressVIPMinimum/Tests/VIP/RegexpCompareUnitTest.php
rename to WordPressVIPMinimum/Tests/Performance/RegexpCompareUnitTest.php
index 297f9bdd..0aa1c004 100644
--- a/WordPressVIPMinimum/Tests/VIP/RegexpCompareUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Performance/RegexpCompareUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\VIP;
+namespace WordPressVIPMinimum\Tests\Performance;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/VIP/RemoteRequestTimeoutUnitTest.inc b/WordPressVIPMinimum/Tests/Performance/RemoteRequestTimeoutUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/VIP/RemoteRequestTimeoutUnitTest.inc
rename to WordPressVIPMinimum/Tests/Performance/RemoteRequestTimeoutUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/VIP/RemoteRequestTimeoutUnitTest.php b/WordPressVIPMinimum/Tests/Performance/RemoteRequestTimeoutUnitTest.php
similarity index 93%
rename from WordPressVIPMinimum/Tests/VIP/RemoteRequestTimeoutUnitTest.php
rename to WordPressVIPMinimum/Tests/Performance/RemoteRequestTimeoutUnitTest.php
index df0bd5aa..49c7a2e7 100644
--- a/WordPressVIPMinimum/Tests/VIP/RemoteRequestTimeoutUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Performance/RemoteRequestTimeoutUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\VIP;
+namespace WordPressVIPMinimum\Tests\Performance;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/VIP/TaxonomyMetaInOptionsUnitTest.inc b/WordPressVIPMinimum/Tests/Performance/TaxonomyMetaInOptionsUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/VIP/TaxonomyMetaInOptionsUnitTest.inc
rename to WordPressVIPMinimum/Tests/Performance/TaxonomyMetaInOptionsUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/VIP/TaxonomyMetaInOptionsUnitTest.php b/WordPressVIPMinimum/Tests/Performance/TaxonomyMetaInOptionsUnitTest.php
similarity index 94%
rename from WordPressVIPMinimum/Tests/VIP/TaxonomyMetaInOptionsUnitTest.php
rename to WordPressVIPMinimum/Tests/Performance/TaxonomyMetaInOptionsUnitTest.php
index e4af55e9..af1e0c5d 100644
--- a/WordPressVIPMinimum/Tests/VIP/TaxonomyMetaInOptionsUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Performance/TaxonomyMetaInOptionsUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\VIP;
+namespace WordPressVIPMinimum\Tests\Performance;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/VIP/WPQueryParamsUnitTest.inc b/WordPressVIPMinimum/Tests/Performance/WPQueryParamsUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/VIP/WPQueryParamsUnitTest.inc
rename to WordPressVIPMinimum/Tests/Performance/WPQueryParamsUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/VIP/WPQueryParamsUnitTest.php b/WordPressVIPMinimum/Tests/Performance/WPQueryParamsUnitTest.php
similarity index 93%
rename from WordPressVIPMinimum/Tests/VIP/WPQueryParamsUnitTest.php
rename to WordPressVIPMinimum/Tests/Performance/WPQueryParamsUnitTest.php
index 896ccffa..d63892f7 100644
--- a/WordPressVIPMinimum/Tests/VIP/WPQueryParamsUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Performance/WPQueryParamsUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\VIP;
+namespace WordPressVIPMinimum\Tests\Performance;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/VIP/EscapingVoidReturnFunctionsUnitTest.inc b/WordPressVIPMinimum/Tests/Security/EscapingVoidReturnFunctionsUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/VIP/EscapingVoidReturnFunctionsUnitTest.inc
rename to WordPressVIPMinimum/Tests/Security/EscapingVoidReturnFunctionsUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/VIP/EscapingVoidReturnFunctionsUnitTest.php b/WordPressVIPMinimum/Tests/Security/EscapingVoidReturnFunctionsUnitTest.php
similarity index 94%
rename from WordPressVIPMinimum/Tests/VIP/EscapingVoidReturnFunctionsUnitTest.php
rename to WordPressVIPMinimum/Tests/Security/EscapingVoidReturnFunctionsUnitTest.php
index 7d942731..0dee7479 100644
--- a/WordPressVIPMinimum/Tests/VIP/EscapingVoidReturnFunctionsUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Security/EscapingVoidReturnFunctionsUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\VIP;
+namespace WordPressVIPMinimum\Tests\Security;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/VIP/ExitAfterRedirectUnitTest.inc b/WordPressVIPMinimum/Tests/Security/ExitAfterRedirectUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/VIP/ExitAfterRedirectUnitTest.inc
rename to WordPressVIPMinimum/Tests/Security/ExitAfterRedirectUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/VIP/ExitAfterRedirectUnitTest.php b/WordPressVIPMinimum/Tests/Security/ExitAfterRedirectUnitTest.php
similarity index 94%
rename from WordPressVIPMinimum/Tests/VIP/ExitAfterRedirectUnitTest.php
rename to WordPressVIPMinimum/Tests/Security/ExitAfterRedirectUnitTest.php
index 25ec2156..053d9ebe 100644
--- a/WordPressVIPMinimum/Tests/VIP/ExitAfterRedirectUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Security/ExitAfterRedirectUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\VIP;
+namespace WordPressVIPMinimum\Tests\Security;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputMustacheUnitTest.inc b/WordPressVIPMinimum/Tests/Security/MustacheUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputMustacheUnitTest.inc
rename to WordPressVIPMinimum/Tests/Security/MustacheUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputMustacheUnitTest.php b/WordPressVIPMinimum/Tests/Security/MustacheUnitTest.php
similarity index 85%
rename from WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputMustacheUnitTest.php
rename to WordPressVIPMinimum/Tests/Security/MustacheUnitTest.php
index 2fe2da32..d7f38041 100644
--- a/WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputMustacheUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Security/MustacheUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\TemplatingEngines;
+namespace WordPressVIPMinimum\Tests\Security;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
@@ -14,7 +14,7 @@
  *
  * @package VIPCS\WordPressVIPMinimum
  */
-class UnescapedOutputMustacheUnitTest extends AbstractSniffUnitTest {
+class MustacheUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPressVIPMinimum/Tests/VIP/PHPFilterFunctionsUnitTest.inc b/WordPressVIPMinimum/Tests/Security/PHPFilterFunctionsUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/VIP/PHPFilterFunctionsUnitTest.inc
rename to WordPressVIPMinimum/Tests/Security/PHPFilterFunctionsUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/VIP/PHPFilterFunctionsUnitTest.php b/WordPressVIPMinimum/Tests/Security/PHPFilterFunctionsUnitTest.php
similarity index 94%
rename from WordPressVIPMinimum/Tests/VIP/PHPFilterFunctionsUnitTest.php
rename to WordPressVIPMinimum/Tests/Security/PHPFilterFunctionsUnitTest.php
index 1645a49e..1d908a4d 100644
--- a/WordPressVIPMinimum/Tests/VIP/PHPFilterFunctionsUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Security/PHPFilterFunctionsUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\VIP;
+namespace WordPressVIPMinimum\Tests\Security;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/VIP/ProperEscapingFunctionUnitTest.inc b/WordPressVIPMinimum/Tests/Security/ProperEscapingFunctionUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/VIP/ProperEscapingFunctionUnitTest.inc
rename to WordPressVIPMinimum/Tests/Security/ProperEscapingFunctionUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/VIP/ProperEscapingFunctionUnitTest.php b/WordPressVIPMinimum/Tests/Security/ProperEscapingFunctionUnitTest.php
similarity index 94%
rename from WordPressVIPMinimum/Tests/VIP/ProperEscapingFunctionUnitTest.php
rename to WordPressVIPMinimum/Tests/Security/ProperEscapingFunctionUnitTest.php
index 99132df3..8fa5dd4e 100644
--- a/WordPressVIPMinimum/Tests/VIP/ProperEscapingFunctionUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Security/ProperEscapingFunctionUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\VIP;
+namespace WordPressVIPMinimum\Tests\Security;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/VIP/StaticStrreplaceUnitTest.inc b/WordPressVIPMinimum/Tests/Security/StaticStrreplaceUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/VIP/StaticStrreplaceUnitTest.inc
rename to WordPressVIPMinimum/Tests/Security/StaticStrreplaceUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/VIP/StaticStrreplaceUnitTest.php b/WordPressVIPMinimum/Tests/Security/StaticStrreplaceUnitTest.php
similarity index 94%
rename from WordPressVIPMinimum/Tests/VIP/StaticStrreplaceUnitTest.php
rename to WordPressVIPMinimum/Tests/Security/StaticStrreplaceUnitTest.php
index 2bcf7a5a..cc3ed4e6 100644
--- a/WordPressVIPMinimum/Tests/VIP/StaticStrreplaceUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Security/StaticStrreplaceUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\VIP;
+namespace WordPressVIPMinimum\Tests\Security;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputTwigUnitTest.inc b/WordPressVIPMinimum/Tests/Security/TwigUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputTwigUnitTest.inc
rename to WordPressVIPMinimum/Tests/Security/TwigUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputTwigUnitTest.php b/WordPressVIPMinimum/Tests/Security/TwigUnitTest.php
similarity index 84%
rename from WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputTwigUnitTest.php
rename to WordPressVIPMinimum/Tests/Security/TwigUnitTest.php
index 8b065996..19989225 100644
--- a/WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputTwigUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Security/TwigUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\TemplatingEngines;
+namespace WordPressVIPMinimum\Tests\Security;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
@@ -14,7 +14,7 @@
  *
  * @package VIPCS\WordPressVIPMinimum
  */
-class UnescapedOutputTwigUnitTest extends AbstractSniffUnitTest {
+class TwigUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputUnderscorejsUnitTest.inc b/WordPressVIPMinimum/Tests/Security/UnderscorejsUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputUnderscorejsUnitTest.inc
rename to WordPressVIPMinimum/Tests/Security/UnderscorejsUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputUnderscorejsUnitTest.php b/WordPressVIPMinimum/Tests/Security/UnderscorejsUnitTest.php
similarity index 84%
rename from WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputUnderscorejsUnitTest.php
rename to WordPressVIPMinimum/Tests/Security/UnderscorejsUnitTest.php
index 149eb8dc..29b88003 100644
--- a/WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputUnderscorejsUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Security/UnderscorejsUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\TemplatingEngines;
+namespace WordPressVIPMinimum\Tests\Security;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
@@ -14,7 +14,7 @@
  *
  * @package VIPCS\WordPressVIPMinimum
  */
-class UnescapedOutputUnderscorejsUnitTest extends AbstractSniffUnitTest {
+class UnderscorejsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputVuejsUnitTest.inc b/WordPressVIPMinimum/Tests/Security/VuejsUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputVuejsUnitTest.inc
rename to WordPressVIPMinimum/Tests/Security/VuejsUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputVuejsUnitTest.php b/WordPressVIPMinimum/Tests/Security/VuejsUnitTest.php
similarity index 84%
rename from WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputVuejsUnitTest.php
rename to WordPressVIPMinimum/Tests/Security/VuejsUnitTest.php
index 8594206f..7979c7a5 100644
--- a/WordPressVIPMinimum/Tests/TemplatingEngines/UnescapedOutputVuejsUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Security/VuejsUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\TemplatingEngines;
+namespace WordPressVIPMinimum\Tests\Security;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
@@ -14,7 +14,7 @@
  *
  * @package VIPCS\WordPressVIPMinimum
  */
-class UnescapedOutputVuejsUnitTest extends AbstractSniffUnitTest {
+class VuejsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.
diff --git a/WordPressVIPMinimum/Tests/VIP/AdminBarRemovalUnitTest.css b/WordPressVIPMinimum/Tests/UserExperience/AdminBarRemovalUnitTest.css
similarity index 85%
rename from WordPressVIPMinimum/Tests/VIP/AdminBarRemovalUnitTest.css
rename to WordPressVIPMinimum/Tests/UserExperience/AdminBarRemovalUnitTest.css
index 44081626..0143208b 100644
--- a/WordPressVIPMinimum/Tests/VIP/AdminBarRemovalUnitTest.css
+++ b/WordPressVIPMinimum/Tests/UserExperience/AdminBarRemovalUnitTest.css
@@ -41,7 +41,7 @@
 }
 
 
-/* phpcs:set WordPressVIPMinimum.VIP.AdminBarRemoval remove_only false */
+/* phpcs:set WordPressVIPMinimum.UserExperience.AdminBarRemoval remove_only false */
 #wpadminbar {
 	display: block; /* Bad. */
 	visibility: visible; /* Bad. */
@@ -52,4 +52,4 @@
 	visibility: hidden; /* OK. */
 	opacity: 0; /* OK. */
 }
-/* phpcs:set WordPressVIPMinimum.VIP.AdminBarRemoval remove_only true */
+/* phpcs:set WordPressVIPMinimum.UserExperience.AdminBarRemoval remove_only true */
diff --git a/WordPressVIPMinimum/Tests/VIP/AdminBarRemovalUnitTest.inc b/WordPressVIPMinimum/Tests/UserExperience/AdminBarRemovalUnitTest.inc
similarity index 87%
rename from WordPressVIPMinimum/Tests/VIP/AdminBarRemovalUnitTest.inc
rename to WordPressVIPMinimum/Tests/UserExperience/AdminBarRemovalUnitTest.inc
index 4f472f4d..7e694368 100644
--- a/WordPressVIPMinimum/Tests/VIP/AdminBarRemovalUnitTest.inc
+++ b/WordPressVIPMinimum/Tests/UserExperience/AdminBarRemovalUnitTest.inc
@@ -8,10 +8,10 @@ show_admin_bar( true ); // Ok.
 
 add_filter( 'show_admin_bar', 'my_own_return_false' ); // Bad.
 
-// phpcs:set WordPressVIPMinimum.VIP.AdminBarRemoval remove_only false
+// phpcs:set WordPressVIPMinimum.UserExperience.AdminBarRemoval remove_only false
 add_filter( 'show_admin_bar', '__return_true' ); // Bad.
 show_admin_bar( true ); // Bad.
-// phpcs:set WordPressVIPMinimum.VIP.AdminBarRemoval remove_only true
+// phpcs:set WordPressVIPMinimum.UserExperience.AdminBarRemoval remove_only true
 
 // Testing T_CONSTANT_ENCAPSED_STRING.
 echo '<style type="text/css">
@@ -85,7 +85,7 @@ EOT;
 </style>
 
 <?php
-// phpcs:set WordPressVIPMinimum.VIP.AdminBarRemoval remove_only false
+// phpcs:set WordPressVIPMinimum.UserExperience.AdminBarRemoval remove_only false
 $style = <<<EOT
 <style type="text/css">
 	.show-admin-bar {
@@ -105,4 +105,4 @@ EOT;
 		opacity: 1; /* Bad. */
 	}
 </style>
-/* phpcs:set WordPressVIPMinimum.VIP.AdminBarRemoval remove_only true */
+/* phpcs:set WordPressVIPMinimum.UserExperience.AdminBarRemoval remove_only true */
diff --git a/WordPressVIPMinimum/Tests/VIP/AdminBarRemovalUnitTest.php b/WordPressVIPMinimum/Tests/UserExperience/AdminBarRemovalUnitTest.php
similarity index 97%
rename from WordPressVIPMinimum/Tests/VIP/AdminBarRemovalUnitTest.php
rename to WordPressVIPMinimum/Tests/UserExperience/AdminBarRemovalUnitTest.php
index 9b983299..5e427e36 100644
--- a/WordPressVIPMinimum/Tests/VIP/AdminBarRemovalUnitTest.php
+++ b/WordPressVIPMinimum/Tests/UserExperience/AdminBarRemovalUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\VIP;
+namespace WordPressVIPMinimum\Tests\UserExperience;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/VIP/RestrictedVariablesUnitTest.inc b/WordPressVIPMinimum/Tests/Variables/RestrictedVariablesUnitTest.inc
similarity index 83%
rename from WordPressVIPMinimum/Tests/VIP/RestrictedVariablesUnitTest.inc
rename to WordPressVIPMinimum/Tests/Variables/RestrictedVariablesUnitTest.inc
index d745775e..61c4a5b2 100644
--- a/WordPressVIPMinimum/Tests/VIP/RestrictedVariablesUnitTest.inc
+++ b/WordPressVIPMinimum/Tests/Variables/RestrictedVariablesUnitTest.inc
@@ -28,10 +28,10 @@ $phrase = <<<EOD
 Your user-agent is {$_SERVER['HTTP_USER_AGENT']}
 EOD;
 
-// phpcs:set WordPress.VIP.RestrictedVariables exclude user_meta
+// phpcs:set WordPressVIPMinimum.Variables.RestrictedVariables exclude user_meta
 $query = "SELECT * FROM $wpdb->usermeta"; // Error.
 
-// phpcs:set WordPress.VIP.RestrictedFunctions exclude false
+// phpcs:set WordPressVIPMinimum.Functions.RestrictedFunctions exclude false
 
 foo( $_SESSION ); // Error.
 foo( $_SESSION['bar'] ); // Error.
diff --git a/WordPressVIPMinimum/Tests/VIP/RestrictedVariablesUnitTest.php b/WordPressVIPMinimum/Tests/Variables/RestrictedVariablesUnitTest.php
similarity index 96%
rename from WordPressVIPMinimum/Tests/VIP/RestrictedVariablesUnitTest.php
rename to WordPressVIPMinimum/Tests/Variables/RestrictedVariablesUnitTest.php
index 757dad91..eaba9c0c 100644
--- a/WordPressVIPMinimum/Tests/VIP/RestrictedVariablesUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Variables/RestrictedVariablesUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPress\Tests\VIP;
+namespace WordPress\Tests\Variables;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/Tests/VIP/MergeConflictUnitTest.inc b/WordPressVIPMinimum/Tests/VersionControl/MergeConflictUnitTest.inc
similarity index 100%
rename from WordPressVIPMinimum/Tests/VIP/MergeConflictUnitTest.inc
rename to WordPressVIPMinimum/Tests/VersionControl/MergeConflictUnitTest.inc
diff --git a/WordPressVIPMinimum/Tests/VIP/MergeConflictUnitTest.php b/WordPressVIPMinimum/Tests/VersionControl/MergeConflictUnitTest.php
similarity index 93%
rename from WordPressVIPMinimum/Tests/VIP/MergeConflictUnitTest.php
rename to WordPressVIPMinimum/Tests/VersionControl/MergeConflictUnitTest.php
index a03beff4..f0e40e67 100644
--- a/WordPressVIPMinimum/Tests/VIP/MergeConflictUnitTest.php
+++ b/WordPressVIPMinimum/Tests/VersionControl/MergeConflictUnitTest.php
@@ -5,7 +5,7 @@
  * @package VIPCS\WordPressVIPMinimum
  */
 
-namespace WordPressVIPMinimum\Tests\VIP;
+namespace WordPressVIPMinimum\Tests\VersionControl;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
diff --git a/WordPressVIPMinimum/ruleset.xml b/WordPressVIPMinimum/ruleset.xml
index bc325783..a754c896 100644
--- a/WordPressVIPMinimum/ruleset.xml
+++ b/WordPressVIPMinimum/ruleset.xml
@@ -15,7 +15,7 @@
 		</properties>
 	</rule>
 
-	<rule ref="WordPressVIPMinimum.TemplatingEngines.UnescapedOutputTwig">
+	<rule ref="WordPressVIPMinimum.Security.Twig">
 		<include-pattern>*.twig</include-pattern>
 	</rule>
 
@@ -140,7 +140,7 @@
 		<message>`%s()` is highly discouraged, please use `vip_safe_wp_remote_get()` instead.</message>
 	</rule>
 
-	<rule ref="WordPressVIPMinimum.VIP.RestrictedFunctions.get_posts_get_children">
+	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.get_posts_get_children">
 		<type>error</type>
 		<message>`%1$s()` performs a no-LIMIT query by default, make sure to set a reasonable `posts_per_page`. `%1$s()` will do a -1 query by default, a maximum of 100 should be used.</message>
 	</rule>
diff --git a/ruleset_test.inc b/ruleset_test.inc
index df73ff40..093662af 100644
--- a/ruleset_test.inc
+++ b/ruleset_test.inc
@@ -63,7 +63,7 @@ class TestClass extends MyClass {
 // WordPress.WP.AlternativeFunctions
 curl_init(); // Warning.
 
-// WordPressVIPMinimum.Actions.PreGetPosts
+// WordPressVIPMinimum.Hooks.PreGetPosts
 add_action( 'pre_get_posts', function( $wp_query ) {
 	if ( ! $wp_query->is_search() ) {
 		$wp_query->set( 'cat', '-5' ); // Warning.
@@ -80,7 +80,7 @@ class MyWidget extends WP_Widget {
 	} // Error (line above), missing $args and $instance params.
 }
 
-// WordPressVIPMinimum.Constants.ConstantRestictions
+// WordPressVIPMinimum.Constants.RestrictedConstants
 if ( A8C_PROXIED_REQUEST === true ) { // Warning.
 }
 
@@ -92,19 +92,19 @@ $my_theme_options = get_option( 'my_theme', false );
 if ( array_key_exists( 'key', $my_theme_options ) ) { // Error.
 }
 
-// Generic.PHP>NoSilencedErrors + WordPressVIPMinimum.VIP.RestrictedFunctions.file_get_contents_file_get_contents
+// Generic.PHP>NoSilencedErrors + WordPressVIPMinimum.Functions.RestrictedFunctions.file_get_contents_file_get_contents
 @file_get_contents( $foo ); // Error + Warning.
 
-// WordPressVIPMinimum.VIP.RegexpCompare + WordPress.VIP.SlowDBQuery
+// WordPressVIPMinimum.Performance.RegexpCompare + WordPress.DB.SlowDBQuery
 $query_args = array(
 	'posts_per_page' => 1,
 	'post_status' => 'draft',
-	'meta_key' => 'my_awesome_meta_key', // WordPress.VIP.SlowDBQuery. // Warning.
-	'meta_value' => "(^|\n|\r\n)99999($|\n|\r\n)", // WordPress.VIP.SlowDBQuery. // Warning.
+	'meta_key' => 'my_awesome_meta_key', // WordPress.DB.SlowDBQuery. // Warning.
+	'meta_value' => "(^|\n|\r\n)99999($|\n|\r\n)", // WordPress.DB.SlowDBQuery. // Warning.
 	'meta_compare' => 'REGEXP', // Error.
 );
 
-// WordPressVIPMinimum.VIP.RemoteRequestTimeout
+// WordPressVIPMinimum.Performance.RemoteRequestTimeout
 wp_remote_post( $this->endpoint, array(
         'method'      => 'POST',
         'timeout'     => 45, // Error.
@@ -117,7 +117,7 @@ wp_remote_post( $this->endpoint, array(
 // Squiz.PHP.Eval
 eval( ';' ); // Error.
 
-// WordPressVIPMinimum.VIP.RestrictedFunctions
+// WordPressVIPMinimum.Functions.RestrictedFunctions
 wpcom_vip_irc(); // Error.
 
 get_children(); // Error + Message.