diff --git a/package.xml b/package.xml
index f8da7ac8fd..68b7734cf8 100644
--- a/package.xml
+++ b/package.xml
@@ -320,11 +320,11 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="NestingLevelStandard.xml" role="php" />
        </dir>
        <dir name="NamingConventions">
-        <file baseinstalldir="PHP/CodeSniffer" name="AbstractPrefixRequiredForAbstractClassStandard.xml" role="php" />
+        <file baseinstalldir="PHP/CodeSniffer" name="AbstractClassNamePrefixStandard.xml" role="php" />
         <file baseinstalldir="PHP/CodeSniffer" name="CamelCapsFunctionNameStandard.xml" role="php" />
         <file baseinstalldir="PHP/CodeSniffer" name="ConstructorNameStandard.xml" role="php" />
-        <file baseinstalldir="PHP/CodeSniffer" name="InterfaceSuffixRequiredForInterfaceStandard.xml" role="php" />
-        <file baseinstalldir="PHP/CodeSniffer" name="TraitSuffixRequiredForTraitStandard.xml" role="php" />
+        <file baseinstalldir="PHP/CodeSniffer" name="InterfaceNameSuffixStandard.xml" role="php" />
+        <file baseinstalldir="PHP/CodeSniffer" name="TraitNameSuffixStandard.xml" role="php" />
         <file baseinstalldir="PHP/CodeSniffer" name="UpperCaseConstantNameStandard.xml" role="php" />
        </dir>
        <dir name="PHP">
@@ -428,11 +428,11 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="NestingLevelSniff.php" role="php" />
        </dir>
        <dir name="NamingConventions">
-        <file baseinstalldir="PHP/CodeSniffer" name="AbstractPrefixRequiredForAbstractClassSniff.php" role="php" />
+        <file baseinstalldir="PHP/CodeSniffer" name="AbstractClassNamePrefixSniff.php" role="php" />
         <file baseinstalldir="PHP/CodeSniffer" name="CamelCapsFunctionNameSniff.php" role="php" />
         <file baseinstalldir="PHP/CodeSniffer" name="ConstructorNameSniff.php" role="php" />
-        <file baseinstalldir="PHP/CodeSniffer" name="InterfaceSuffixRequiredForInterfaceSniff.php" role="php" />
-        <file baseinstalldir="PHP/CodeSniffer" name="TraitSuffixRequiredForTraitSniff.php" role="php" />
+        <file baseinstalldir="PHP/CodeSniffer" name="InterfaceNameSuffixSniff.php" role="php" />
+        <file baseinstalldir="PHP/CodeSniffer" name="TraitNameSuffixSniff.php" role="php" />
         <file baseinstalldir="PHP/CodeSniffer" name="UpperCaseConstantNameSniff.php" role="php" />
        </dir>
        <dir name="PHP">
@@ -676,16 +676,16 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="NestingLevelUnitTest.php" role="test" />
        </dir>
        <dir name="NamingConventions">
-        <file baseinstalldir="PHP/CodeSniffer" name="AbstractPrefixRequiredForAbstractClassUnitTest.inc" role="test" />
-        <file baseinstalldir="PHP/CodeSniffer" name="AbstractPrefixRequiredForAbstractClassUnitTest.php" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="AbstractClassNamePrefixUnitTest.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="AbstractClassNamePrefixUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="CamelCapsFunctionNameUnitTest.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="CamelCapsFunctionNameUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="ConstructorNameUnitTest.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="ConstructorNameUnitTest.php" role="test" />
-        <file baseinstalldir="PHP/CodeSniffer" name="InterfaceSuffixRequiredForInterfaceUnitTest.inc" role="test" />
-        <file baseinstalldir="PHP/CodeSniffer" name="InterfaceSuffixRequiredForInterfaceUnitTest.php" role="test" />
-        <file baseinstalldir="PHP/CodeSniffer" name="TraitSuffixRequiredForTraitUnitTest.inc" role="test" />
-        <file baseinstalldir="PHP/CodeSniffer" name="TraitSuffixRequiredForTraitUnitTest.php" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="InterfaceNameSuffixUnitTest.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="InterfaceNameSuffixUnitTest.php" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="TraitNameSuffixUnitTest.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="TraitNameSuffixUnitTest.php" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="UpperCaseConstantNameUnitTest.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="UpperCaseConstantNameUnitTest.php" role="test" />
        </dir>
diff --git a/src/Standards/Generic/Docs/NamingConventions/AbstractPrefixRequiredForAbstractClassStandard.xml b/src/Standards/Generic/Docs/NamingConventions/AbstractClassNamePrefixStandard.xml
similarity index 83%
rename from src/Standards/Generic/Docs/NamingConventions/AbstractPrefixRequiredForAbstractClassStandard.xml
rename to src/Standards/Generic/Docs/NamingConventions/AbstractClassNamePrefixStandard.xml
index 4f84fa4465..c30d26e9d5 100644
--- a/src/Standards/Generic/Docs/NamingConventions/AbstractPrefixRequiredForAbstractClassStandard.xml
+++ b/src/Standards/Generic/Docs/NamingConventions/AbstractClassNamePrefixStandard.xml
@@ -1,7 +1,7 @@
 <documentation title="Abstract class name">
     <standard>
     <![CDATA[
-    Abstract classes MUST be prefixed by Abstract: e.g. AbstractBar.
+    Abstract class names must be prefixed with "Abstract", e.g. AbstractBar.
     ]]>
     </standard>
     <code_comparison>
diff --git a/src/Standards/Generic/Docs/NamingConventions/InterfaceSuffixRequiredForInterfaceStandard.xml b/src/Standards/Generic/Docs/NamingConventions/InterfaceNameSuffixStandard.xml
similarity index 73%
rename from src/Standards/Generic/Docs/NamingConventions/InterfaceSuffixRequiredForInterfaceStandard.xml
rename to src/Standards/Generic/Docs/NamingConventions/InterfaceNameSuffixStandard.xml
index d4f38447e5..0aa0c76e4d 100644
--- a/src/Standards/Generic/Docs/NamingConventions/InterfaceSuffixRequiredForInterfaceStandard.xml
+++ b/src/Standards/Generic/Docs/NamingConventions/InterfaceNameSuffixStandard.xml
@@ -1,7 +1,7 @@
-<documentation title="Interface name">
+<documentation title="Interface name suffix">
     <standard>
     <![CDATA[
-    Interfaces MUST be suffixed by Interface: e.g. BarInterface.
+    Interface names must be suffixed with "Interface", e.g. BarInterface.
     ]]>
     </standard>
     <code_comparison>
diff --git a/src/Standards/Generic/Docs/NamingConventions/TraitSuffixRequiredForTraitStandard.xml b/src/Standards/Generic/Docs/NamingConventions/TraitNameSuffixStandard.xml
similarity index 75%
rename from src/Standards/Generic/Docs/NamingConventions/TraitSuffixRequiredForTraitStandard.xml
rename to src/Standards/Generic/Docs/NamingConventions/TraitNameSuffixStandard.xml
index 62c9b26d46..711867e451 100644
--- a/src/Standards/Generic/Docs/NamingConventions/TraitSuffixRequiredForTraitStandard.xml
+++ b/src/Standards/Generic/Docs/NamingConventions/TraitNameSuffixStandard.xml
@@ -1,7 +1,7 @@
-<documentation title="Trait name">
+<documentation title="Trait name suffix">
     <standard>
     <![CDATA[
-    Traits MUST be suffixed by Trait: e.g. BarTrait.
+    Trait names must be suffixed with "Trait", e.g. BarTrait.
     ]]>
     </standard>
     <code_comparison>
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/AbstractPrefixRequiredForAbstractClassSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php
similarity index 87%
rename from src/Standards/Generic/Sniffs/NamingConventions/AbstractPrefixRequiredForAbstractClassSniff.php
rename to src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php
index 7892e111fc..3e3af830d3 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/AbstractPrefixRequiredForAbstractClassSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php
@@ -11,7 +11,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
-class AbstractPrefixRequiredForAbstractClassSniff implements Sniff
+class AbstractClassNamePrefixSniff implements Sniff
 {
 
 
@@ -51,7 +51,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         $prefix = substr($className, 0, 8);
         if (strtolower($prefix) !== 'abstract') {
-            $phpcsFile->addError('Abstract classes MUST be prefixed by Abstract: e.g. AbstractBar. Found: %s', $stackPtr, 'Missing', [$className]);
+            $phpcsFile->addError('Abstract class names must be prefixed with "Abstract"; found "%s"', $stackPtr, 'Missing', [$className]);
         }
 
     }//end process()
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/InterfaceSuffixRequiredForInterfaceSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php
similarity index 85%
rename from src/Standards/Generic/Sniffs/NamingConventions/InterfaceSuffixRequiredForInterfaceSniff.php
rename to src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php
index 0f388a178b..c5dc34d489 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/InterfaceSuffixRequiredForInterfaceSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php
@@ -11,7 +11,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
-class InterfaceSuffixRequiredForInterfaceSniff implements Sniff
+class InterfaceNameSuffixSniff implements Sniff
 {
 
 
@@ -45,7 +45,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         $suffix = substr($interfaceName, -9);
         if (strtolower($suffix) !== 'interface') {
-            $phpcsFile->addError('Interfaces MUST be suffixed by Interface: e.g. BarInterface. Found: %s', $stackPtr, 'Missing', [$interfaceName]);
+            $phpcsFile->addError('Interface names must be suffixed with "Interface"; found "%s"', $stackPtr, 'Missing', [$interfaceName]);
         }
 
     }//end process()
diff --git a/src/Standards/Generic/Sniffs/NamingConventions/TraitSuffixRequiredForTraitSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php
similarity index 86%
rename from src/Standards/Generic/Sniffs/NamingConventions/TraitSuffixRequiredForTraitSniff.php
rename to src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php
index d886669cb1..4e3b211dff 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/TraitSuffixRequiredForTraitSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php
@@ -11,7 +11,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
 
-class TraitSuffixRequiredForTraitSniff implements Sniff
+class TraitNameSuffixSniff implements Sniff
 {
 
 
@@ -45,7 +45,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         $suffix = substr($traitName, -5);
         if (strtolower($suffix) !== 'trait') {
-            $phpcsFile->addError('Traits MUST be suffixed by Trait: e.g. BarTrait. Found: %s', $stackPtr, 'Missing', [$traitName]);
+            $phpcsFile->addError('Trait names must be suffixed with "Trait"; found "%s"', $stackPtr, 'Missing', [$traitName]);
         }
 
     }//end process()
diff --git a/src/Standards/Generic/Tests/NamingConventions/AbstractPrefixRequiredForAbstractClassUnitTest.inc b/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.inc
similarity index 100%
rename from src/Standards/Generic/Tests/NamingConventions/AbstractPrefixRequiredForAbstractClassUnitTest.inc
rename to src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.inc
diff --git a/src/Standards/Generic/Tests/NamingConventions/AbstractPrefixRequiredForAbstractClassUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php
similarity index 87%
rename from src/Standards/Generic/Tests/NamingConventions/AbstractPrefixRequiredForAbstractClassUnitTest.php
rename to src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php
index 94aa0dc296..7be4e8f887 100644
--- a/src/Standards/Generic/Tests/NamingConventions/AbstractPrefixRequiredForAbstractClassUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Unit test class for the AbstractPrefixRequiredForAbstractClass sniff.
+ * Unit test class for the AbstractClassNamePrefix sniff.
  *
  * @author  Anna Borzenko <annnechko@gmail.com>
  * @license https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
@@ -10,7 +10,7 @@
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
-class AbstractPrefixRequiredForAbstractClassUnitTest extends AbstractSniffUnitTest
+class AbstractClassNamePrefixUnitTest extends AbstractSniffUnitTest
 {
 
 
diff --git a/src/Standards/Generic/Tests/NamingConventions/InterfaceSuffixRequiredForInterfaceUnitTest.inc b/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.inc
similarity index 100%
rename from src/Standards/Generic/Tests/NamingConventions/InterfaceSuffixRequiredForInterfaceUnitTest.inc
rename to src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.inc
diff --git a/src/Standards/Generic/Tests/NamingConventions/InterfaceSuffixRequiredForInterfaceUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php
similarity index 87%
rename from src/Standards/Generic/Tests/NamingConventions/InterfaceSuffixRequiredForInterfaceUnitTest.php
rename to src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php
index ccbf634893..b4d9696f91 100644
--- a/src/Standards/Generic/Tests/NamingConventions/InterfaceSuffixRequiredForInterfaceUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Unit test class for the InterfaceSuffixRequiredForInterface sniff.
+ * Unit test class for the InterfaceNameSuffix sniff.
  *
  * @author  Anna Borzenko <annnechko@gmail.com>
  * @license https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
@@ -10,7 +10,7 @@
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
-class InterfaceSuffixRequiredForInterfaceUnitTest extends AbstractSniffUnitTest
+class InterfaceSuffixNameUnitTest extends AbstractSniffUnitTest
 {
 
 
diff --git a/src/Standards/Generic/Tests/NamingConventions/TraitSuffixRequiredForTraitUnitTest.inc b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.inc
similarity index 100%
rename from src/Standards/Generic/Tests/NamingConventions/TraitSuffixRequiredForTraitUnitTest.inc
rename to src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.inc
diff --git a/src/Standards/Generic/Tests/NamingConventions/TraitSuffixRequiredForTraitUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php
similarity index 88%
rename from src/Standards/Generic/Tests/NamingConventions/TraitSuffixRequiredForTraitUnitTest.php
rename to src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php
index 07f1b4c843..742fdd1ab4 100644
--- a/src/Standards/Generic/Tests/NamingConventions/TraitSuffixRequiredForTraitUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Unit test class for the TraitSuffixRequiredForTrait sniff.
+ * Unit test class for the TraitNameSuffix sniff.
  *
  * @author  Anna Borzenko <annnechko@gmail.com>
  * @license https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
@@ -10,7 +10,7 @@
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
-class TraitSuffixRequiredForTraitUnitTest extends AbstractSniffUnitTest
+class TraitNameSuffixUnitTest extends AbstractSniffUnitTest
 {