diff --git a/WordPress-Core/ruleset.xml b/WordPress-Core/ruleset.xml
index ad38a740d8..df69483819 100644
--- a/WordPress-Core/ruleset.xml
+++ b/WordPress-Core/ruleset.xml
@@ -21,7 +21,7 @@
 
 	<!-- http://make.wordpress.org/core/handbook/coding-standards/php/#no-shorthand-php-tags -->
 	<rule ref="Generic.PHP.DisallowShortOpenTag"/>
-	<rule ref="WordPress.PHP.DisallowAlternativeOpenTag"/>
+	<rule ref="WordPress.PHP.DisallowAlternativePHPTags"/>
 
 	<!-- important to prevent issues with content being sent before headers -->
 	<rule ref="Generic.Files.ByteOrderMark"/>
diff --git a/WordPress/Sniffs/PHP/DisallowAlternativeOpenTagSniff.php b/WordPress/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php
similarity index 96%
rename from WordPress/Sniffs/PHP/DisallowAlternativeOpenTagSniff.php
rename to WordPress/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php
index 42c8d0eb6a..b2270e3387 100644
--- a/WordPress/Sniffs/PHP/DisallowAlternativeOpenTagSniff.php
+++ b/WordPress/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php
@@ -8,7 +8,9 @@
  */
 
 /**
- * Makes sure that no alternative PHP open tags are used.
+ * Verifies that no alternative PHP open tags are used.
+ *
+ * If alternative PHP open tags are found, this sniff can fix both the open and close tags.
  *
  * @link     https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/issues/580
  *
@@ -16,7 +18,7 @@
  * @package  PHP_CodeSniffer
  * @author   Juliette Reinders Folmer <wpplugins_nospam@adviesenzo.nl>
  */
-class WordPress_Sniffs_PHP_DisallowAlternativeOpenTagSniff implements PHP_CodeSniffer_Sniff {
+class WordPress_Sniffs_PHP_DisallowAlternativePHPTagsSniff implements PHP_CodeSniffer_Sniff {
 
 	/**
 	 * Returns an array of tokens this test wants to listen for.
diff --git a/WordPress/Tests/PHP/DisallowAlternativeOpenTagUnitTest.fixed b/WordPress/Tests/PHP/DisallowAlternativePHPTagsUnitTest.fixed
similarity index 100%
rename from WordPress/Tests/PHP/DisallowAlternativeOpenTagUnitTest.fixed
rename to WordPress/Tests/PHP/DisallowAlternativePHPTagsUnitTest.fixed
diff --git a/WordPress/Tests/PHP/DisallowAlternativeOpenTagUnitTest.inc b/WordPress/Tests/PHP/DisallowAlternativePHPTagsUnitTest.inc
similarity index 100%
rename from WordPress/Tests/PHP/DisallowAlternativeOpenTagUnitTest.inc
rename to WordPress/Tests/PHP/DisallowAlternativePHPTagsUnitTest.inc
diff --git a/WordPress/Tests/PHP/DisallowAlternativeOpenTagUnitTest.php b/WordPress/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php
similarity index 93%
rename from WordPress/Tests/PHP/DisallowAlternativeOpenTagUnitTest.php
rename to WordPress/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php
index 71e536b2e0..f27083a7ca 100644
--- a/WordPress/Tests/PHP/DisallowAlternativeOpenTagUnitTest.php
+++ b/WordPress/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php
@@ -8,7 +8,7 @@
  */
 
 /**
- * Unit test class for the DisallowAlternativeOpenTag sniff.
+ * Unit test class for the DisallowAlternativePHPTags sniff.
  *
  * A sniff unit test checks a .inc file for expected violations of a single
  * coding standard. Expected errors and warnings are stored in this class.
@@ -17,7 +17,7 @@
  * @package  PHP_CodeSniffer
  * @author   Juliette Reinders Folmer <wpplugins_nospam@adviesenzo.nl>
  */
-class WordPress_Tests_PHP_DisallowAlternativeOpenTagUnitTest extends AbstractSniffUnitTest {
+class WordPress_Tests_PHP_DisallowAlternativePHPTagsUnitTest extends AbstractSniffUnitTest {
 
 	/**
 	 * Returns the lines where errors should occur.