diff --git a/src/Standards/Generic/Docs/ControlStructures/DisallowYodaConditionsStandard.xml b/src/Standards/Generic/Docs/ControlStructures/DisallowYodaConditionsStandard.xml
index 570e4192b3..651cc70d34 100644
--- a/src/Standards/Generic/Docs/ControlStructures/DisallowYodaConditionsStandard.xml
+++ b/src/Standards/Generic/Docs/ControlStructures/DisallowYodaConditionsStandard.xml
@@ -5,14 +5,14 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: value to be asserted must go on the right side of the comparison.">
+        <code title="Valid: Value to be asserted must go on the right side of the comparison.">
         <![CDATA[
 if ($test === null) <em>{</em>
     $var = 1;
 <em>}</em>
         ]]>
         </code>
-        <code title="Invalid: value to be asserted must not be on the left.">
+        <code title="Invalid: Value to be asserted must not be on the left.">
         <![CDATA[
 if (null === $test) <em>{</em>
     $var = 1;
diff --git a/src/Standards/Generic/Docs/Files/InlineHTMLStandard.xml b/src/Standards/Generic/Docs/Files/InlineHTMLStandard.xml
index 3fbf5024db..3c137a9a91 100644
--- a/src/Standards/Generic/Docs/Files/InlineHTMLStandard.xml
+++ b/src/Standards/Generic/Docs/Files/InlineHTMLStandard.xml
@@ -1,18 +1,18 @@
 <documentation title="Inline HTML">
     <standard>
     <![CDATA[
-    Files that contain php code should only have php code and should not have any "inline html".
+    Files that contain PHP code should only have PHP code and should not have any "inline html".
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: A php file with only php code in it.">
+        <code title="Valid: A PHP file with only PHP code in it.">
         <![CDATA[
 <?php
 $foo = 'bar';
 echo $foo . 'baz';
         ]]>
         </code>
-        <code title="Invalid: A php file with html in it outside of the php tags.">
+        <code title="Invalid: A PHP file with html in it outside of the PHP tags.">
         <![CDATA[
 <em>some string here</em>
 <?php
diff --git a/src/Standards/Generic/Docs/Formatting/MultipleStatementAlignmentStandard.xml b/src/Standards/Generic/Docs/Formatting/MultipleStatementAlignmentStandard.xml
index 4c33d763d9..09df3b7cf6 100644
--- a/src/Standards/Generic/Docs/Formatting/MultipleStatementAlignmentStandard.xml
+++ b/src/Standards/Generic/Docs/Formatting/MultipleStatementAlignmentStandard.xml
@@ -1,18 +1,18 @@
 <documentation title="Aligning Blocks of Assignments">
     <standard>
     <![CDATA[
-      There should be one space on either side of an equals sign used to assign a value to a variable. In the case of a block of related assignments, more space may be inserted to promote readability.
+    There should be one space on either side of an equals sign used to assign a value to a variable. In the case of a block of related assignments, more space may be inserted to promote readability.
     ]]>
     </standard>
     <code_comparison>
-        <code title="Equals signs aligned">
+        <code title="Valid: Equals signs aligned.">
         <![CDATA[
 $shortVar        <em>=</em> (1 + 2);
 $veryLongVarName <em>=</em> 'string';
 $var             <em>=</em> foo($bar, $baz);
         ]]>
         </code>
-        <code title="Not aligned; harder to read">
+        <code title="Invalid: Not aligned; harder to read.">
         <![CDATA[
 $shortVar <em>=</em> (1 + 2);
 $veryLongVarName <em>=</em> 'string';
@@ -22,17 +22,17 @@ $var <em>=</em> foo($bar, $baz);
     </code_comparison>
     <standard>
     <![CDATA[
-      When using plus-equals, minus-equals etc. still ensure the equals signs are aligned to one space after the longest variable name.
+    When using plus-equals, minus-equals etc. still ensure the equals signs are aligned to one space after the longest variable name.
     ]]>
     </standard>
     <code_comparison>
-        <code title="Equals signs aligned; only one space after longest var name">
+        <code title="Valid: Equals signs aligned; only one space after longest var name.">
         <![CDATA[
 $shortVar       <em>+= </em>1;
 $veryLongVarName<em> = </em>1;
         ]]>
         </code>
-        <code title="Two spaces after longest var name">
+        <code title="Invalid: Two spaces after longest var name.">
         <![CDATA[
 $shortVar       <em> += </em>1;
 $veryLongVarName<em>  = </em>1;
@@ -40,13 +40,13 @@ $veryLongVarName<em>  = </em>1;
         </code>
     </code_comparison>
     <code_comparison>
-        <code title="Equals signs aligned">
+        <code title="Valid: Equals signs aligned.">
         <![CDATA[
 $shortVar       <em>  = </em>1;
 $veryLongVarName<em> -= </em>1;
         ]]>
         </code>
-        <code title="Equals signs not aligned">
+        <code title="Invalid: Equals signs not aligned.">
         <![CDATA[
 $shortVar       <em> = </em>1;
 $veryLongVarName<em> -= </em>1;
diff --git a/src/Standards/Generic/Docs/Functions/OpeningFunctionBraceBsdAllmanStandard.xml b/src/Standards/Generic/Docs/Functions/OpeningFunctionBraceBsdAllmanStandard.xml
index 414dc289ef..76314c5086 100644
--- a/src/Standards/Generic/Docs/Functions/OpeningFunctionBraceBsdAllmanStandard.xml
+++ b/src/Standards/Generic/Docs/Functions/OpeningFunctionBraceBsdAllmanStandard.xml
@@ -5,7 +5,7 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: brace on next line">
+        <code title="Valid: Brace on next line.">
         <![CDATA[
 function fooFunction($arg1, $arg2 = '')
 <em>{</em>
@@ -13,7 +13,7 @@ function fooFunction($arg1, $arg2 = '')
 }
         ]]>
         </code>
-        <code title="Invalid: brace on same line">
+        <code title="Invalid: Brace on same line.">
         <![CDATA[
 function fooFunction($arg1, $arg2 = '') <em>{</em>
     ...
diff --git a/src/Standards/Generic/Docs/Functions/OpeningFunctionBraceKernighanRitchieStandard.xml b/src/Standards/Generic/Docs/Functions/OpeningFunctionBraceKernighanRitchieStandard.xml
index 84c2bdd869..acd65e08b0 100644
--- a/src/Standards/Generic/Docs/Functions/OpeningFunctionBraceKernighanRitchieStandard.xml
+++ b/src/Standards/Generic/Docs/Functions/OpeningFunctionBraceKernighanRitchieStandard.xml
@@ -5,14 +5,14 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: brace on same line">
+        <code title="Valid: Brace on same line.">
         <![CDATA[
 function fooFunction($arg1, $arg2 = '')<em> {</em>
     ...
 }
         ]]>
         </code>
-        <code title="Invalid: brace on next line">
+        <code title="Invalid: Brace on next line.">
         <![CDATA[
 function fooFunction($arg1, $arg2 = '')
 <em>{</em>
diff --git a/src/Standards/Generic/Docs/NamingConventions/AbstractClassNamePrefixStandard.xml b/src/Standards/Generic/Docs/NamingConventions/AbstractClassNamePrefixStandard.xml
index c30d26e9d5..e9e61ddd67 100644
--- a/src/Standards/Generic/Docs/NamingConventions/AbstractClassNamePrefixStandard.xml
+++ b/src/Standards/Generic/Docs/NamingConventions/AbstractClassNamePrefixStandard.xml
@@ -5,14 +5,14 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: ">
+        <code title="Valid: Class name starts with 'Abstract'.">
         <![CDATA[
 abstract class <em>AbstractBar</em>
 {
 }
         ]]>
         </code>
-        <code title="Invalid: ">
+        <code title="Invalid: Class name does not start with 'Abstract'.">
         <![CDATA[
 abstract class <em>Bar</em>
 {
diff --git a/src/Standards/Generic/Docs/NamingConventions/InterfaceNameSuffixStandard.xml b/src/Standards/Generic/Docs/NamingConventions/InterfaceNameSuffixStandard.xml
index 0aa0c76e4d..bf1a70769e 100644
--- a/src/Standards/Generic/Docs/NamingConventions/InterfaceNameSuffixStandard.xml
+++ b/src/Standards/Generic/Docs/NamingConventions/InterfaceNameSuffixStandard.xml
@@ -5,14 +5,14 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: ">
+        <code title="Valid: Interface name ends on 'Interface'.">
         <![CDATA[
 interface <em>BarInterface</em>
 {
 }
         ]]>
         </code>
-        <code title="Invalid: ">
+        <code title="Invalid: Interface name does not end on 'Interface'.">
         <![CDATA[
 interface <em>Bar</em>
 {
diff --git a/src/Standards/Generic/Docs/NamingConventions/TraitNameSuffixStandard.xml b/src/Standards/Generic/Docs/NamingConventions/TraitNameSuffixStandard.xml
index 711867e451..fb5f2e670a 100644
--- a/src/Standards/Generic/Docs/NamingConventions/TraitNameSuffixStandard.xml
+++ b/src/Standards/Generic/Docs/NamingConventions/TraitNameSuffixStandard.xml
@@ -5,14 +5,14 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: ">
+        <code title="Valid: Trait name ends on 'Trait'.">
         <![CDATA[
 trait <em>BarTrait</em>
 {
 }
         ]]>
         </code>
-        <code title="Invalid: ">
+        <code title="Invalid: Trait name does not end on 'Trait'.">
         <![CDATA[
 trait <em>Bar</em>
 {
diff --git a/src/Standards/Generic/Docs/NamingConventions/UpperCaseConstantNameStandard.xml b/src/Standards/Generic/Docs/NamingConventions/UpperCaseConstantNameStandard.xml
index 6ef61b93c9..22c2f6b12f 100644
--- a/src/Standards/Generic/Docs/NamingConventions/UpperCaseConstantNameStandard.xml
+++ b/src/Standards/Generic/Docs/NamingConventions/UpperCaseConstantNameStandard.xml
@@ -1,11 +1,11 @@
 <documentation title="Constant Names">
     <standard>
     <![CDATA[
-     Constants should always be all-uppercase, with underscores to separate words.
+    Constants should always be all-uppercase, with underscores to separate words.
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: all uppercase">
+        <code title="Valid: All uppercase constant name.">
         <![CDATA[
 define('<em>FOO_CONSTANT</em>', 'foo');
 
@@ -15,7 +15,7 @@ class FooClass
 }
         ]]>
         </code>
-        <code title="Invalid: mixed case">
+        <code title="Invalid: Mixed case or lowercase constant name.">
         <![CDATA[
 define('<em>Foo_Constant</em>', 'foo');
 
diff --git a/src/Standards/Generic/Docs/PHP/CharacterBeforePHPOpeningTagStandard.xml b/src/Standards/Generic/Docs/PHP/CharacterBeforePHPOpeningTagStandard.xml
index df5a0eba4c..494a5d7383 100644
--- a/src/Standards/Generic/Docs/PHP/CharacterBeforePHPOpeningTagStandard.xml
+++ b/src/Standards/Generic/Docs/PHP/CharacterBeforePHPOpeningTagStandard.xml
@@ -1,17 +1,17 @@
 <documentation title="Opening Tag at Start of File">
     <standard>
     <![CDATA[
-    The opening php tag should be the first item in the file.
+    The opening PHP tag should be the first item in the file.
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: A file starting with an opening php tag.">
+        <code title="Valid: A file starting with an opening PHP tag.">
         <![CDATA[
 <em></em><?php
 echo 'Foo';
         ]]>
         </code>
-        <code title="Invalid: A file with content before the opening php tag.">
+        <code title="Invalid: A file with content before the opening PHP tag.">
         <![CDATA[
 <em>Beginning content</em>
 <?php
diff --git a/src/Standards/Generic/Docs/PHP/ClosingPHPTagStandard.xml b/src/Standards/Generic/Docs/PHP/ClosingPHPTagStandard.xml
index 09afb2d75a..f0c8e5298b 100644
--- a/src/Standards/Generic/Docs/PHP/ClosingPHPTagStandard.xml
+++ b/src/Standards/Generic/Docs/PHP/ClosingPHPTagStandard.xml
@@ -1,11 +1,11 @@
 <documentation title="Closing PHP Tags">
     <standard>
     <![CDATA[
-    All opening php tags should have a corresponding closing tag.
+    All opening PHP tags should have a corresponding closing tag.
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: A closing tag paired with it's opening tag.">
+        <code title="Valid: A closing tag paired with its opening tag.">
         <![CDATA[
 <em><?php</em>
 echo 'Foo';
diff --git a/src/Standards/Generic/Docs/PHP/LowerCaseConstantStandard.xml b/src/Standards/Generic/Docs/PHP/LowerCaseConstantStandard.xml
index 7dc30c10d5..d4aac8093f 100644
--- a/src/Standards/Generic/Docs/PHP/LowerCaseConstantStandard.xml
+++ b/src/Standards/Generic/Docs/PHP/LowerCaseConstantStandard.xml
@@ -5,14 +5,14 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: lowercase constants">
+        <code title="Valid: Lowercase constants.">
         <![CDATA[
 if ($var === <em>false</em> || $var === <em>null</em>) {
     $var = <em>true</em>;
 }
         ]]>
         </code>
-        <code title="Invalid: uppercase constants">
+        <code title="Invalid: Uppercase constants.">
         <![CDATA[
 if ($var === <em>FALSE</em> || $var === <em>NULL</em>) {
     $var = <em>TRUE</em>;
diff --git a/src/Standards/Generic/Docs/PHP/RequireStrictTypesStandard.xml b/src/Standards/Generic/Docs/PHP/RequireStrictTypesStandard.xml
index 701cb484e0..dc72430695 100644
--- a/src/Standards/Generic/Docs/PHP/RequireStrictTypesStandard.xml
+++ b/src/Standards/Generic/Docs/PHP/RequireStrictTypesStandard.xml
@@ -5,14 +5,14 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: strict_types declaration is present.">
+        <code title="Valid: `strict_types` declaration is present.">
         <![CDATA[
 declare(<em>strict_types=1</em>);
 
 declare(encoding='UTF-8', <em>strict_types=0</em>);
         ]]>
         </code>
-        <code title="Invalid: Missing strict_types declaration.">
+        <code title="Invalid: Missing `strict_types` declaration.">
         <![CDATA[
 declare(encoding='ISO-8859-1'<em></em>);
         ]]>
@@ -24,12 +24,12 @@ declare(encoding='ISO-8859-1'<em></em>);
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: strict_types declaration is enabled.">
+        <code title="Valid: `strict_types` declaration is enabled.">
         <![CDATA[
 declare(strict_types=<em>1</em>);
         ]]>
         </code>
-        <code title="Invalid: strict_types declaration is disabled.">
+        <code title="Invalid: `strict_types` declaration is disabled.">
         <![CDATA[
 declare(strict_types=<em>0</em>);
         ]]>
diff --git a/src/Standards/Generic/Docs/PHP/SAPIUsageStandard.xml b/src/Standards/Generic/Docs/PHP/SAPIUsageStandard.xml
index e74005ad12..989827ed97 100644
--- a/src/Standards/Generic/Docs/PHP/SAPIUsageStandard.xml
+++ b/src/Standards/Generic/Docs/PHP/SAPIUsageStandard.xml
@@ -12,7 +12,7 @@ if (<em>PHP_SAPI</em> === 'cli') {
 }
         ]]>
         </code>
-        <code title="Invalid: php_sapi_name() is used.">
+        <code title="Invalid: Function call to php_sapi_name() is used.">
         <![CDATA[
 if (<em>php_sapi_name()</em> === 'cli') {
     echo "Hello, CLI user.";
diff --git a/src/Standards/Generic/Docs/PHP/UpperCaseConstantStandard.xml b/src/Standards/Generic/Docs/PHP/UpperCaseConstantStandard.xml
index 1f337f77ed..2cc1df2f45 100644
--- a/src/Standards/Generic/Docs/PHP/UpperCaseConstantStandard.xml
+++ b/src/Standards/Generic/Docs/PHP/UpperCaseConstantStandard.xml
@@ -5,14 +5,14 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: uppercase constants">
+        <code title="Valid: Uppercase constants.">
         <![CDATA[
 if ($var === <em>FALSE</em> || $var === <em>NULL</em>) {
     $var = <em>TRUE</em>;
 }
         ]]>
         </code>
-        <code title="Invalid: lowercase constants">
+        <code title="Invalid: Lowercase constants.">
         <![CDATA[
 if ($var === <em>false</em> || $var === <em>null</em>) {
     $var = <em>true</em>;
diff --git a/src/Standards/Generic/Docs/VersionControl/SubversionPropertiesStandard.xml b/src/Standards/Generic/Docs/VersionControl/SubversionPropertiesStandard.xml
index f4f3e19cb5..c38ae4c449 100644
--- a/src/Standards/Generic/Docs/VersionControl/SubversionPropertiesStandard.xml
+++ b/src/Standards/Generic/Docs/VersionControl/SubversionPropertiesStandard.xml
@@ -1,7 +1,7 @@
 <documentation title="Subversion Properties">
     <standard>
     <![CDATA[
-    All php files in a subversion repository should have the svn:keywords property set to 'Author Id Revision' and the svn:eol-style property set to 'native'.
+    All PHP files in a subversion repository should have the svn:keywords property set to 'Author Id Revision' and the svn:eol-style property set to 'native'.
     ]]>
     </standard>
 </documentation>
diff --git a/src/Standards/Generic/Docs/WhiteSpace/ArbitraryParenthesesSpacingStandard.xml b/src/Standards/Generic/Docs/WhiteSpace/ArbitraryParenthesesSpacingStandard.xml
index 338c838933..d65c93a8c9 100644
--- a/src/Standards/Generic/Docs/WhiteSpace/ArbitraryParenthesesSpacingStandard.xml
+++ b/src/Standards/Generic/Docs/WhiteSpace/ArbitraryParenthesesSpacingStandard.xml
@@ -5,12 +5,12 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: no spaces on the inside of a set of arbitrary parentheses.">
+        <code title="Valid: No spaces on the inside of a set of arbitrary parentheses.">
         <![CDATA[
 $a = (null !== $extra);
         ]]>
         </code>
-        <code title="Invalid: spaces or new lines on the inside of a set of arbitrary parentheses.">
+        <code title="Invalid: Spaces or new lines on the inside of a set of arbitrary parentheses.">
         <![CDATA[
 $a = ( null !== $extra );
 
diff --git a/src/Standards/Generic/Docs/WhiteSpace/SpreadOperatorSpacingAfterStandard.xml b/src/Standards/Generic/Docs/WhiteSpace/SpreadOperatorSpacingAfterStandard.xml
index d33b6051d4..7663b0c437 100644
--- a/src/Standards/Generic/Docs/WhiteSpace/SpreadOperatorSpacingAfterStandard.xml
+++ b/src/Standards/Generic/Docs/WhiteSpace/SpreadOperatorSpacingAfterStandard.xml
@@ -17,7 +17,7 @@ function foo(<em>&...$spread</em>) {
 }
         ]]>
         </code>
-        <code title="Invalid: space found between the spread operator and the variable/function call it applies to.">
+        <code title="Invalid: Space found between the spread operator and the variable/function call it applies to.">
         <![CDATA[
 function bar(<em>... </em>$spread) {
     bar(<em>...
diff --git a/src/Standards/PEAR/Docs/Commenting/FileCommentStandard.xml b/src/Standards/PEAR/Docs/Commenting/FileCommentStandard.xml
index eef0b4e397..190670f75c 100644
--- a/src/Standards/PEAR/Docs/Commenting/FileCommentStandard.xml
+++ b/src/Standards/PEAR/Docs/Commenting/FileCommentStandard.xml
@@ -1,7 +1,14 @@
 <documentation title="File Comments">
     <standard>
     <![CDATA[
-    Files must have a non-empty doc comment.  The short description must be on the second line of the comment.  Each description must have one blank comment line before and after.  There must be one blank line before the tags in the comments.  There must be a category, package, author, license, and link tag.  There may only be one category, package, subpackage, license, version, since and deprecated tag.  The tags must be in the order category, package, subpackage, author, copyright, license, version, link, see, since, and deprecated.  The php version must be specified.
+    Files must have a non-empty doc comment.
+    The short description must be on the second line of the comment.
+    Each description must have one blank comment line before and after.
+    There must be one blank line before the tags in the comments.
+    There must be a category, package, author, license, and link tag.
+    There may only be one category, package, subpackage, license, version, since and deprecated tag.
+    The tags must be in the order category, package, subpackage, author, copyright, license, version, link, see, since, and deprecated.
+    The PHP version must be specified.
     ]]>
     </standard>
     <code_comparison>
@@ -231,16 +238,14 @@
  */
         ]]>
         </code>
-        <code title="Invalid: Category and package tags are swapped in order.">
+        <code title="Invalid: No PHP version specified.">
         <![CDATA[
 <?php
 /**
  * Short description here.
  *
- * PHP version 5
- *
- * <em>@package</em> Foo_Helpers
- * <em>@category</em> Foo
+ * @category Foo
+ * @package Foo_Helpers
  * @author Marty McFly <mmcfly@example.com>
  * @copyright 2013-2014 Foo Inc.
  * @license MIT License
@@ -267,14 +272,16 @@
  */
         ]]>
         </code>
-        <code title="Invalid: No php version specified.">
+        <code title="Invalid: Category and package tags are swapped in order.">
         <![CDATA[
 <?php
 /**
  * Short description here.
  *
- * @category Foo
- * @package Foo_Helpers
+ * PHP version 5
+ *
+ * <em>@package</em> Foo_Helpers
+ * <em>@category</em> Foo
  * @author Marty McFly <mmcfly@example.com>
  * @copyright 2013-2014 Foo Inc.
  * @license MIT License
diff --git a/src/Standards/PEAR/Docs/Files/IncludingFileStandard.xml b/src/Standards/PEAR/Docs/Files/IncludingFileStandard.xml
index 6d115be768..912fa5e0eb 100644
--- a/src/Standards/PEAR/Docs/Files/IncludingFileStandard.xml
+++ b/src/Standards/PEAR/Docs/Files/IncludingFileStandard.xml
@@ -10,12 +10,12 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: used as statement">
+        <code title="Valid: Used as statement.">
         <![CDATA[
 require_once 'PHP/CodeSniffer.php';
         ]]>
         </code>
-        <code title="Invalid: used as function">
+        <code title="Invalid: Used as function.">
         <![CDATA[
 require_once<em>(</em>'PHP/CodeSniffer.php'<em>)</em>;
         ]]>
diff --git a/src/Standards/PEAR/Docs/Functions/FunctionCallSignatureStandard.xml b/src/Standards/PEAR/Docs/Functions/FunctionCallSignatureStandard.xml
index f87422778e..2f539c9b51 100644
--- a/src/Standards/PEAR/Docs/Functions/FunctionCallSignatureStandard.xml
+++ b/src/Standards/PEAR/Docs/Functions/FunctionCallSignatureStandard.xml
@@ -1,16 +1,16 @@
 <documentation title="Function Calls">
     <standard>
     <![CDATA[
-      Functions should be called with no spaces between the function name, the opening parenthesis, and the first parameter; and no space between the last parameter, the closing parenthesis, and the semicolon.
+    Functions should be called with no spaces between the function name, the opening parenthesis, and the first parameter; and no space between the last parameter, the closing parenthesis, and the semicolon.
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: spaces between parameters">
+        <code title="Valid: Spaces between parameters.">
         <![CDATA[
 $var = foo($bar, $baz, $quux);
         ]]>
         </code>
-        <code title="Invalid: additional spaces used">
+        <code title="Invalid: Additional spaces used.">
         <![CDATA[
 $var = foo<em> </em>(<em> </em>$bar, $baz, $quux<em> </em>)<em> </em>;
         ]]>
diff --git a/src/Standards/PEAR/Docs/Functions/ValidDefaultValueStandard.xml b/src/Standards/PEAR/Docs/Functions/ValidDefaultValueStandard.xml
index 56196cb620..ef9bc32626 100644
--- a/src/Standards/PEAR/Docs/Functions/ValidDefaultValueStandard.xml
+++ b/src/Standards/PEAR/Docs/Functions/ValidDefaultValueStandard.xml
@@ -5,7 +5,7 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: argument with default value at end of declaration">
+        <code title="Valid: Argument with default value at end of declaration.">
         <![CDATA[
 function connect($dsn, <em>$persistent = false</em>)
 {
@@ -13,7 +13,7 @@ function connect($dsn, <em>$persistent = false</em>)
 }
         ]]>
         </code>
-        <code title="Invalid: argument with default value at start of declaration">
+        <code title="Invalid: Argument with default value at start of declaration.">
         <![CDATA[
 function connect(<em>$persistent = false</em>, $dsn)
 {
diff --git a/src/Standards/PEAR/Docs/NamingConventions/ValidClassNameStandard.xml b/src/Standards/PEAR/Docs/NamingConventions/ValidClassNameStandard.xml
index d160879196..052fb2babc 100644
--- a/src/Standards/PEAR/Docs/NamingConventions/ValidClassNameStandard.xml
+++ b/src/Standards/PEAR/Docs/NamingConventions/ValidClassNameStandard.xml
@@ -5,14 +5,14 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Examples of valid class names">
+        <code title="Valid: Examples of valid class names.">
         <![CDATA[
 Log
 Net_Finger
 HTML_Upload_Error
         ]]>
         </code>
-        <code title="Examples of invalid class names">
+        <code title="Invalid: Examples of invalid class names.">
         <![CDATA[
 log
 NetFinger
diff --git a/src/Standards/PEAR/Docs/NamingConventions/ValidFunctionNameStandard.xml b/src/Standards/PEAR/Docs/NamingConventions/ValidFunctionNameStandard.xml
index 60841dd4c7..5dcff71a63 100644
--- a/src/Standards/PEAR/Docs/NamingConventions/ValidFunctionNameStandard.xml
+++ b/src/Standards/PEAR/Docs/NamingConventions/ValidFunctionNameStandard.xml
@@ -5,7 +5,7 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Examples of valid function names">
+        <code title="Valid: Examples of valid function names.">
         <![CDATA[
 connect()
 getData()
@@ -13,7 +13,7 @@ buildSomeWidget()
 XML_RPC_serializeData()
         ]]>
         </code>
-        <code title="Examples of invalid function names">
+        <code title="Invalid: Examples of invalid function names.">
         <![CDATA[
 Connect()
 get_data()
diff --git a/src/Standards/PEAR/Docs/NamingConventions/ValidVariableNameStandard.xml b/src/Standards/PEAR/Docs/NamingConventions/ValidVariableNameStandard.xml
index 4c707bdd10..1f8e6d2b5b 100644
--- a/src/Standards/PEAR/Docs/NamingConventions/ValidVariableNameStandard.xml
+++ b/src/Standards/PEAR/Docs/NamingConventions/ValidVariableNameStandard.xml
@@ -15,7 +15,7 @@ class Foo
 }
         ]]>
         </code>
-        <code title="Invalid: underscores used on public/protected variables and not used on private variables.">
+        <code title="Invalid: Underscores used on public/protected variables and not used on private variables.">
         <![CDATA[
 class Foo
 {
diff --git a/src/Standards/PSR1/Docs/Files/SideEffectsStandard.xml b/src/Standards/PSR1/Docs/Files/SideEffectsStandard.xml
index 0ed04a07dd..3bb83470f9 100644
--- a/src/Standards/PSR1/Docs/Files/SideEffectsStandard.xml
+++ b/src/Standards/PSR1/Docs/Files/SideEffectsStandard.xml
@@ -1,7 +1,7 @@
 <documentation title="Side Effects">
     <standard>
     <![CDATA[
-    A php file should either contain declarations with no side effects, or should just have logic (including side effects) with no declarations.
+    A PHP file should either contain declarations with no side effects, or should just have logic (including side effects) with no declarations.
     ]]>
     </standard>
     <code_comparison>
diff --git a/src/Standards/PSR1/Docs/Methods/CamelCapsMethodNameStandard.xml b/src/Standards/PSR1/Docs/Methods/CamelCapsMethodNameStandard.xml
index 8db899d677..66df4e1ce1 100644
--- a/src/Standards/PSR1/Docs/Methods/CamelCapsMethodNameStandard.xml
+++ b/src/Standards/PSR1/Docs/Methods/CamelCapsMethodNameStandard.xml
@@ -5,7 +5,7 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: method name in camelCase.">
+        <code title="Valid: Method name in camelCase.">
         <![CDATA[
 class Foo
 {
@@ -15,7 +15,7 @@ class Foo
 }
         ]]>
         </code>
-        <code title="Invalid: method name not in camelCase.">
+        <code title="Invalid: Method name not in camelCase.">
         <![CDATA[
 class Foo
 {
diff --git a/src/Standards/PSR12/Docs/Functions/NullableTypeDeclarationStandard.xml b/src/Standards/PSR12/Docs/Functions/NullableTypeDeclarationStandard.xml
index ac411ffbe3..95904c9a8b 100644
--- a/src/Standards/PSR12/Docs/Functions/NullableTypeDeclarationStandard.xml
+++ b/src/Standards/PSR12/Docs/Functions/NullableTypeDeclarationStandard.xml
@@ -5,7 +5,7 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: no whitespace used.">
+        <code title="Valid: No whitespace used.">
         <![CDATA[
 public function functionName(
     ?string $arg1,
@@ -14,7 +14,7 @@ public function functionName(
 }
         ]]>
         </code>
-        <code title="Invalid: superfluous whitespace used.">
+        <code title="Invalid: Superfluous whitespace used.">
         <![CDATA[
 public function functionName(
     ? string $arg1,
@@ -25,14 +25,14 @@ public function functionName(
         </code>
     </code_comparison>
     <code_comparison>
-        <code title="Valid: no unexpected characters.">
+        <code title="Valid: No unexpected characters.">
         <![CDATA[
 public function foo(?int $arg): ?string
 {
 }
         ]]>
         </code>
-        <code title="Invalid: unexpected characters used.">
+        <code title="Invalid: Unexpected characters used.">
         <![CDATA[
 public function bar(? /* comment */ int $arg): ?
     // nullable for a reason
diff --git a/src/Standards/PSR2/Docs/Methods/MethodDeclarationStandard.xml b/src/Standards/PSR2/Docs/Methods/MethodDeclarationStandard.xml
index e45469e804..91ff8c2cf3 100644
--- a/src/Standards/PSR2/Docs/Methods/MethodDeclarationStandard.xml
+++ b/src/Standards/PSR2/Docs/Methods/MethodDeclarationStandard.xml
@@ -37,7 +37,7 @@ class Foo
 }
         ]]>
         </code>
-        <code title="Invalid: static keyword used before visibility and final used after.">
+        <code title="Invalid: `static` keyword used before visibility and final used after.">
         <![CDATA[
 class Foo
 {
diff --git a/src/Standards/Squiz/Docs/Arrays/ArrayDeclarationStandard.xml b/src/Standards/Squiz/Docs/Arrays/ArrayDeclarationStandard.xml
index ce4b9ae68c..568fac3050 100644
--- a/src/Standards/Squiz/Docs/Arrays/ArrayDeclarationStandard.xml
+++ b/src/Standards/Squiz/Docs/Arrays/ArrayDeclarationStandard.xml
@@ -10,12 +10,12 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: array keyword lowercase">
+        <code title="Valid: Array keyword lowercase.">
         <![CDATA[
 $array = array('val1', 'val2');
         ]]>
         </code>
-        <code title="Invalid: first letter capitalised">
+        <code title="Invalid: First letter capitalised.">
         <![CDATA[
 $array = Array('val1', 'val2');
         ]]>
@@ -27,7 +27,7 @@ $array = Array('val1', 'val2');
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: first key on second line">
+        <code title="Valid: First key on second line.">
         <![CDATA[
 $array = array(
           'key1' => 'value1',
@@ -35,7 +35,7 @@ $array = array(
          );
         ]]>
         </code>
-        <code title="Invalid: first key on same line">
+        <code title="Invalid: First key on same line.">
         <![CDATA[
 $array = array('key1' => 'value1',
           'key2' => 'value2',
@@ -49,7 +49,7 @@ $array = array('key1' => 'value1',
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: aligned correctly">
+        <code title="Valid: Aligned correctly.">
         <![CDATA[
 $array = array(
          <em> </em>'key1' => 'value1',
@@ -57,7 +57,7 @@ $array = array(
          );
         ]]>
         </code>
-        <code title="Invalid: keys and parenthesis aligned incorrectly">
+        <code title="Invalid: Keys and parenthesis aligned incorrectly.">
         <![CDATA[
 $array = array(
          <em>'</em>key1' => 'value1',
@@ -72,7 +72,7 @@ $array = array(
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: keys and values aligned">
+        <code title="Valid: Keys and values aligned.">
         <![CDATA[
 $array = array(
           'keyTen'<em>    </em>=> 'ValueTen',
@@ -80,7 +80,7 @@ $array = array(
          );
         ]]>
         </code>
-        <code title="Invalid: alignment incorrect">
+        <code title="Invalid: Alignment incorrect.">
         <![CDATA[
 $array = array(
           'keyTen'<em> </em>=> 'ValueTen',
@@ -95,7 +95,7 @@ $array = array(
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: comma after each value">
+        <code title="Valid: Comma after each value.">
         <![CDATA[
 $array = array(
           'key1' => 'value1',
@@ -104,7 +104,7 @@ $array = array(
          );
         ]]>
         </code>
-        <code title="Invalid: no comma after last value">
+        <code title="Invalid: No comma after last value.">
         <![CDATA[
 $array = array(
           'key1' => 'value1',
diff --git a/src/Standards/Squiz/Docs/Classes/LowercaseClassKeywordsStandard.xml b/src/Standards/Squiz/Docs/Classes/LowercaseClassKeywordsStandard.xml
index 6d38c5a89b..610edf62f4 100644
--- a/src/Standards/Squiz/Docs/Classes/LowercaseClassKeywordsStandard.xml
+++ b/src/Standards/Squiz/Docs/Classes/LowercaseClassKeywordsStandard.xml
@@ -1,7 +1,7 @@
 <documentation title="Lowercase Class Keywords">
     <standard>
     <![CDATA[
-    The php keywords class, interface, trait, extends, implements, abstract, final, var, and const should be lowercase.
+    The PHP keywords class, interface, trait, extends, implements, abstract, final, var, and const should be lowercase.
     ]]>
     </standard>
     <code_comparison>
diff --git a/src/Standards/Squiz/Docs/ControlStructures/LowercaseDeclarationStandard.xml b/src/Standards/Squiz/Docs/ControlStructures/LowercaseDeclarationStandard.xml
index 08017b752d..d281400be8 100644
--- a/src/Standards/Squiz/Docs/ControlStructures/LowercaseDeclarationStandard.xml
+++ b/src/Standards/Squiz/Docs/ControlStructures/LowercaseDeclarationStandard.xml
@@ -1,7 +1,7 @@
 <documentation title="Lowercase Control Structure Keywords">
     <standard>
     <![CDATA[
-    The php keywords if, else, elseif, foreach, for, do, switch, while, try, and catch should be lowercase.
+    The PHP keywords if, else, elseif, foreach, for, do, switch, while, try, and catch should be lowercase.
     ]]>
     </standard>
     <code_comparison>
diff --git a/src/Standards/Squiz/Docs/Functions/FunctionDuplicateArgumentStandard.xml b/src/Standards/Squiz/Docs/Functions/FunctionDuplicateArgumentStandard.xml
deleted file mode 100644
index 8a0e47eab0..0000000000
--- a/src/Standards/Squiz/Docs/Functions/FunctionDuplicateArgumentStandard.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<documentation title="Lowercase Built-In functions">
-    <standard>
-    <![CDATA[
-    All PHP built-in functions should be lowercased when called.
-    ]]>
-    </standard>
-    <code_comparison>
-        <code title="Valid: Lowercase function call.">
-        <![CDATA[
-if (<em>isset</em>($foo)) {
-    echo $foo;
-}
-        ]]>
-        </code>
-        <code title="Invalid: isset not called as lowercase.">
-        <![CDATA[
-if (<em>isSet</em>($foo)) {
-    echo $foo;
-}
-        ]]>
-        </code>
-    </code_comparison>
-</documentation>
diff --git a/src/Standards/Squiz/Docs/Functions/LowercaseFunctionKeywordsStandard.xml b/src/Standards/Squiz/Docs/Functions/LowercaseFunctionKeywordsStandard.xml
index b97e80733c..fb2ef443ca 100644
--- a/src/Standards/Squiz/Docs/Functions/LowercaseFunctionKeywordsStandard.xml
+++ b/src/Standards/Squiz/Docs/Functions/LowercaseFunctionKeywordsStandard.xml
@@ -1,7 +1,7 @@
 <documentation title="Lowercase Function Keywords">
     <standard>
     <![CDATA[
-    The php keywords function, public, private, protected, and static should be lowercase.
+    The PHP keywords function, public, private, protected, and static should be lowercase.
     ]]>
     </standard>
     <code_comparison>
diff --git a/src/Standards/Squiz/Docs/WhiteSpace/LanguageConstructSpacingStandard.xml b/src/Standards/Squiz/Docs/WhiteSpace/LanguageConstructSpacingStandard.xml
index aceb886754..85838ec329 100644
--- a/src/Standards/Squiz/Docs/WhiteSpace/LanguageConstructSpacingStandard.xml
+++ b/src/Standards/Squiz/Docs/WhiteSpace/LanguageConstructSpacingStandard.xml
@@ -1,7 +1,7 @@
 <documentation title="Language Construct Whitespace">
     <standard>
     <![CDATA[
-    The php constructs echo, print, return, include, include_once, require, require_once, and new should have one space after them.
+    The PHP constructs echo, print, return, include, include_once, require, require_once, and new should have one space after them.
     ]]>
     </standard>
     <code_comparison>
diff --git a/src/Standards/Squiz/Docs/WhiteSpace/ScopeKeywordSpacingStandard.xml b/src/Standards/Squiz/Docs/WhiteSpace/ScopeKeywordSpacingStandard.xml
index 4394ea27ad..f226a128b8 100644
--- a/src/Standards/Squiz/Docs/WhiteSpace/ScopeKeywordSpacingStandard.xml
+++ b/src/Standards/Squiz/Docs/WhiteSpace/ScopeKeywordSpacingStandard.xml
@@ -1,7 +1,7 @@
 <documentation title="Scope Keyword Spacing">
     <standard>
     <![CDATA[
-    The php keywords static, public, private, and protected should have one space after them.
+    The PHP keywords static, public, private, and protected should have one space after them.
     ]]>
     </standard>
     <code_comparison>
diff --git a/src/Standards/Zend/Docs/Files/ClosingTagStandard.xml b/src/Standards/Zend/Docs/Files/ClosingTagStandard.xml
index aa60b8ab93..f1dca3c67a 100644
--- a/src/Standards/Zend/Docs/Files/ClosingTagStandard.xml
+++ b/src/Standards/Zend/Docs/Files/ClosingTagStandard.xml
@@ -1,7 +1,7 @@
 <documentation title="Closing PHP Tags">
     <standard>
     <![CDATA[
-    Files should not have closing php tags.
+    Files should not have closing PHP tags.
     ]]>
     </standard>
     <code_comparison>
@@ -11,7 +11,7 @@
 $var = 1;
         ]]>
         </code>
-        <code title="Invalid: A closing php tag is included at the end of the file.">
+        <code title="Invalid: A closing PHP tag is included at the end of the file.">
         <![CDATA[
 <?php
 $var = 1;