diff --git a/src/lint/linter/__tests__/ArcanistLinterTestCase.php b/src/lint/linter/__tests__/ArcanistLinterTestCase.php
index b86a43b2..a6dc69b5 100644
--- a/src/lint/linter/__tests__/ArcanistLinterTestCase.php
+++ b/src/lint/linter/__tests__/ArcanistLinterTestCase.php
@@ -1,262 +1,326 @@
 <?php
 
 /**
  * Facilitates implementation of test cases for @{class:ArcanistLinter}s.
  */
 abstract class ArcanistLinterTestCase extends PhutilTestCase {
 
   /**
    * Returns an instance of the linter being tested.
    *
    * @return ArcanistLinter
    */
   protected function getLinter() {
     $matches = null;
     if (!preg_match('/^(\w+Linter)TestCase$/', get_class($this), $matches) ||
         !is_subclass_of($matches[1], 'ArcanistLinter')) {
       throw new Exception(pht('Unable to infer linter class name.'));
     }
 
     return newv($matches[1], array());
   }
 
   abstract public function testLinter();
 
   /**
    * Executes all tests from the specified subdirectory. If a linter is not
    * explicitly specified, it will be inferred from the name of the test class.
    */
   protected function executeTestsInDirectory($root) {
     $linter = $this->getLinter();
 
     $files = id(new FileFinder($root))
       ->withType('f')
       ->withSuffix('lint-test')
       ->find();
 
     $test_count = 0;
     foreach ($files as $file) {
       $this->lintFile($root.$file, $linter);
       $test_count++;
     }
 
     $this->assertTrue(
       ($test_count > 0),
       pht(
         'Expected to find some %s tests in directory %s!',
         '.lint-test',
         $root));
   }
 
   private function lintFile($file, ArcanistLinter $linter) {
     $linter = clone $linter;
 
     $contents = Filesystem::readFile($file);
     $contents = preg_split('/^~{4,}\n/m', $contents);
     if (count($contents) < 2) {
       throw new Exception(
         pht(
           "Expected '%s' separating test case and results.",
           '~~~~~~~~~~'));
     }
 
     list($data, $expect, $xform, $config) = array_merge(
       $contents,
       array(null, null));
 
     $basename = basename($file);
 
     if ($config) {
       $config = phutil_json_decode($config);
     } else {
       $config = array();
     }
     PhutilTypeSpec::checkMap(
       $config,
       array(
         'config' => 'optional map<string, wild>',
-        'path' => 'optional string',
         'mode' => 'optional string',
+        'path' => 'optional string',
         'stopped' => 'optional bool',
       ));
 
     $exception = null;
     $after_lint = null;
     $messages = null;
     $exception_message = false;
     $caught_exception = false;
 
     try {
       $tmp = new TempFile($basename);
       Filesystem::writeFile($tmp, $data);
       $full_path = (string)$tmp;
 
       $mode = idx($config, 'mode');
       if ($mode) {
         Filesystem::changePermissions($tmp, octdec($mode));
       }
 
       $dir = dirname($full_path);
       $path = basename($full_path);
 
       $working_copy = ArcanistWorkingCopyIdentity::newFromRootAndConfigFile(
         $dir,
         null,
         pht('Unit Test'));
       $configuration_manager = new ArcanistConfigurationManager();
       $configuration_manager->setWorkingCopyIdentity($working_copy);
 
 
       $engine = new ArcanistUnitTestableLintEngine();
       $engine->setWorkingCopy($working_copy);
       $engine->setConfigurationManager($configuration_manager);
 
       $path_name = idx($config, 'path', $path);
       $engine->setPaths(array($path_name));
 
       $linter->setEngine($engine);
       $linter->addPath($path_name);
       $linter->addData($path_name, $data);
 
       foreach (idx($config, 'config', array()) as $key => $value) {
         $linter->setLinterConfigurationValue($key, $value);
       }
 
       $engine->addLinter($linter);
       $engine->addFileData($path_name, $data);
 
       $results = $engine->run();
       $this->assertEqual(
         1,
         count($results),
         pht('Expect one result returned by linter.'));
 
       $assert_stopped = idx($config, 'stopped');
       if ($assert_stopped !== null) {
         $this->assertEqual(
           $assert_stopped,
           $linter->didStopAllLinters(),
           $assert_stopped
             ? pht('Expect linter to be stopped.')
             : pht('Expect linter to not be stopped.'));
       }
 
       $result = reset($results);
       $patcher = ArcanistLintPatcher::newFromArcanistLintResult($result);
       $after_lint = $patcher->getModifiedFileContent();
     } catch (PhutilTestTerminatedException $ex) {
       throw $ex;
     } catch (Exception $exception) {
       $caught_exception = true;
       if ($exception instanceof PhutilAggregateException) {
         $caught_exception = false;
         foreach ($exception->getExceptions() as $ex) {
           if ($ex instanceof ArcanistUsageException ||
               $ex instanceof ArcanistMissingLinterException) {
             $this->assertSkipped($ex->getMessage());
           } else {
             $caught_exception = true;
           }
         }
       } else if ($exception instanceof ArcanistUsageException ||
                  $exception instanceof ArcanistMissingLinterException) {
         $this->assertSkipped($exception->getMessage());
       }
       $exception_message = $exception->getMessage()."\n\n".
                            $exception->getTraceAsString();
     }
 
     $this->assertEqual(false, $caught_exception, $exception_message);
     $this->compareLint($basename, $expect, $result);
     $this->compareTransform($xform, $after_lint);
   }
 
-  private function compareLint($file, $expect, ArcanistLintResult $result) {
-    $seen = array();
-    $raised = array();
-    $message_map = array();
-
-    foreach ($result->getMessages() as $message) {
-      $sev = $message->getSeverity();
-      $line = $message->getLine();
-      $char = $message->getChar();
-      $code = $message->getCode();
-      $name = $message->getName();
-      $message_key = $sev.':'.$line.':'.$char;
-      $message_map[$message_key] = $message;
-      $seen[] = $message_key;
-      $raised[] = sprintf(
-        '  %s: %s %s',
-        pht('%s at line %d, char %d', $sev, $line, $char),
-        $code,
-        $name);
-    }
+  private function compareLint($file, $expect, ArcanistLintResult $results) {
+    $expected_results = new ArcanistLintResult();
+
     $expect = trim($expect);
     if ($expect) {
       $expect = explode("\n", $expect);
     } else {
       $expect = array();
     }
-    foreach ($expect as $key => $expected) {
-      $expect[$key] = head(explode(' ', $expected));
-    }
 
-    $expect = array_fill_keys($expect, true);
-    $seen   = array_fill_keys($seen, true);
+    foreach ($expect as $result) {
+      $parts = explode(':', $result);
+
+      $message = new ArcanistLintMessage();
+
+      $severity = idx($parts, 0);
+      $line     = idx($parts, 1);
+      $char     = idx($parts, 2);
+      $code     = idx($parts, 3);
+
+      if ($severity !== null) {
+        $message->setSeverity($severity);
+      }
+
+      if ($line !== null) {
+        $message->setLine($line);
+      }
+
+      if ($char !== null) {
+        $message->setChar($char);
+      }
+
+      if ($code !== null) {
+        $message->setCode($code);
+      }
 
-    if (!$raised) {
-      $raised = array(pht('No messages.'));
+      $expected_results->addMessage($message);
     }
-    $raised = sprintf(
-      "%s:\n%s",
-      pht('Actually raised'),
-      implode("\n", $raised));
 
-    foreach (array_diff_key($expect, $seen) as $missing => $ignored) {
-      $missing = explode(':', $missing);
-      $sev = array_shift($missing);
-      $pos = $missing;
+    $missing    = array();
+    $surprising = $results->getMessages();
 
-      $this->assertFailure(
-        pht(
-          "In '%s', expected lint to raise %s on line %d at char %d, ".
-          "but no %s was raised. %s",
-          $file,
-          $sev,
-          idx($pos, 0),
-          idx($pos, 1),
-          $sev,
-          $raised));
+    // TODO: Make this more efficient.
+    foreach ($expected_results->getMessages() as $expected_message) {
+      $found = false;
+
+      foreach ($results->getMessages() as $ii => $actual_message) {
+        if (!self::compareLintMessageProperty(
+          $expected_message->getSeverity(),
+          $actual_message->getSeverity())) {
+
+          continue;
+        }
+
+        if (!self::compareLintMessageProperty(
+          $expected_message->getLine(),
+          $actual_message->getLine())) {
+
+          continue;
+        }
+
+        if (!self::compareLintMessageProperty(
+          $expected_message->getChar(),
+          $actual_message->getChar())) {
+
+          continue;
+        }
+
+        if (!self::compareLintMessageProperty(
+          $expected_message->getCode(),
+          $actual_message->getCode())) {
+
+          continue;
+        }
+
+        $found = true;
+        unset($surprising[$ii]);
+      }
+
+      if (!$found) {
+        $missing[] = $expected_message;
+      }
     }
 
-    foreach (array_diff_key($seen, $expect) as $surprising => $ignored) {
-      $message = $message_map[$surprising];
-      $message_info = $message->getDescription();
+    if ($missing || $surprising) {
+      $expected = pht('EXPECTED MESSAGES');
+      if ($missing) {
+        foreach ($missing as $message) {
+          $expected .= sprintf(
+            "\n  %s: %s %s",
+            pht(
+              '%s at line %d, char %d',
+              $message->getSeverity(),
+              $message->getLine(),
+              $message->getChar()),
+            $message->getCode(),
+            $message->getName());
+        }
+      } else {
+        $expected .= "\n  ".pht('No messages');
+      }
+
+      $actual = pht('UNEXPECTED MESSAGES');
+      if ($surprising) {
+        foreach ($surprising as $message) {
+          $actual .= sprintf(
+            "\n  %s: %s %s",
+            pht(
+              '%s at line %d, char %d',
+              $message->getSeverity(),
+              $message->getLine(),
+              $message->getChar()),
+            $message->getCode(),
+            $message->getName());
+        }
+      } else {
+        $actual .= "\n  ".pht('No messages');
+      }
 
-      list($sev, $line, $char) = explode(':', $surprising);
       $this->assertFailure(
         sprintf(
-          "%s:\n\n%s\n\n%s",
-          pht(
-            "In '%s', lint raised %s on line %d at char %d, ".
-            "but nothing was expected",
-            $file,
-            $sev,
-            $line,
-            $char),
-          $message_info,
-          $raised));
+          "%s\n\n%s\n\n%s",
+          pht("Lint failed for '%s'.", $file),
+          $expected,
+          $actual));
     }
   }
 
   private function compareTransform($expected, $actual) {
     if (!strlen($expected)) {
       return;
     }
     $this->assertEqual(
       $expected,
       $actual,
       pht('File as patched by lint did not match the expected patched file.'));
   }
 
+  /**
+   * Compare properties of @{class:ArcanistLintMessage} instances.
+   *
+   * The expectation is that if one (or both) of the properties is null, then
+   * we don't care about its value.
+   *
+   * @param  wild
+   * @param  wild
+   * @return bool
+   */
+  private static function compareLintMessageProperty($x, $y) {
+    return $x === null || $y === null || $x === $y;
+  }
+
 }
diff --git a/src/lint/linter/__tests__/chmod/empty_executable.lint-test b/src/lint/linter/__tests__/chmod/empty_executable.lint-test
index 54e5a85c..cf8980b6 100644
--- a/src/lint/linter/__tests__/chmod/empty_executable.lint-test
+++ b/src/lint/linter/__tests__/chmod/empty_executable.lint-test
@@ -1,5 +1,5 @@
 ~~~~~~~~~~
-warning::
+warning:0:0:CHMOD1:Invalid Executable
 ~~~~~~~~~~
 ~~~~~~~~~~
 {"mode": "0755"}
diff --git a/src/lint/linter/__tests__/coffeelint/no_trailing_whitespace.lint-test b/src/lint/linter/__tests__/coffeelint/no_trailing_whitespace.lint-test
index 6b43ad21..87351e90 100644
--- a/src/lint/linter/__tests__/coffeelint/no_trailing_whitespace.lint-test
+++ b/src/lint/linter/__tests__/coffeelint/no_trailing_whitespace.lint-test
@@ -1,4 +1,4 @@
 x = 1234      
 y = 1
 ~~~~~~~~~~
-error:1:
+error:1:0
diff --git a/src/lint/linter/__tests__/filename/bad_filename.lint-test b/src/lint/linter/__tests__/filename/bad_filename.lint-test
index 7eb7c745..12ec5757 100644
--- a/src/lint/linter/__tests__/filename/bad_filename.lint-test
+++ b/src/lint/linter/__tests__/filename/bad_filename.lint-test
@@ -1,5 +1,5 @@
 ~~~~~~~~~~
-error::
+error:0:0:NAME1:Bad Filename
 ~~~~~~~~~~
 ~~~~~~~~~~
 {"path": "bad@filename"}
diff --git a/src/lint/linter/__tests__/flake8/undefined.lint-test b/src/lint/linter/__tests__/flake8/undefined.lint-test
index 2f8a2548..72a09df0 100644
--- a/src/lint/linter/__tests__/flake8/undefined.lint-test
+++ b/src/lint/linter/__tests__/flake8/undefined.lint-test
@@ -1,7 +1,7 @@
 x = 'y'
 
 def hello():
     return foo
 ~~~~~~~~~~
-error:3:1
-error:4:12
+error:3:1:E302
+error:4:12:F821
diff --git a/src/lint/linter/__tests__/jshint/dot-notation.lint-test b/src/lint/linter/__tests__/jshint/dot-notation.lint-test
index 681e3505..53cf0f91 100644
--- a/src/lint/linter/__tests__/jshint/dot-notation.lint-test
+++ b/src/lint/linter/__tests__/jshint/dot-notation.lint-test
@@ -1,6 +1,6 @@
 var args = {};
 args['foo'] = 'bar';
 args['bar'] = 'baz';
 ~~~~~~~~~~
-warning:2:5
-warning:3:5
+warning:2:5:W069
+warning:3:5:W069
diff --git a/src/lint/linter/__tests__/jshint/expected-conditional.lint-test b/src/lint/linter/__tests__/jshint/expected-conditional.lint-test
index 2b229273..42b75257 100644
--- a/src/lint/linter/__tests__/jshint/expected-conditional.lint-test
+++ b/src/lint/linter/__tests__/jshint/expected-conditional.lint-test
@@ -1,6 +1,6 @@
 var foo;
 if (foo = 'bar') {
   return true;
 }
 ~~~~~~~~~~
-warning:2:16
+warning:2:16:W084
diff --git a/src/lint/linter/__tests__/jshint/jshint.lint-test b/src/lint/linter/__tests__/jshint/jshint.lint-test
index edb1c779..954e1033 100644
--- a/src/lint/linter/__tests__/jshint/jshint.lint-test
+++ b/src/lint/linter/__tests__/jshint/jshint.lint-test
@@ -1,12 +1,12 @@
 function f() {
   for (ii = 0; ii < 3; ii++) {
     g()
   }
 }
 
 {
 
 ~~~~~~~~~~
-warning:3:8
-error:7:1
-error:9:1
+warning:3:8:W033
+error:7:1:E019
+error:9:1:E041
diff --git a/src/lint/linter/__tests__/jshint/missing-semicolon.lint-test b/src/lint/linter/__tests__/jshint/missing-semicolon.lint-test
index a6669698..23ba765b 100644
--- a/src/lint/linter/__tests__/jshint/missing-semicolon.lint-test
+++ b/src/lint/linter/__tests__/jshint/missing-semicolon.lint-test
@@ -1,3 +1,3 @@
 console.log('foobar')
 ~~~~~~~~~~
-warning:1:22
+warning:1:22:W033
diff --git a/src/lint/linter/__tests__/jshint/too-many-errors.lint-test b/src/lint/linter/__tests__/jshint/too-many-errors.lint-test
index 6dbea1f9..e7b936dd 100644
--- a/src/lint/linter/__tests__/jshint/too-many-errors.lint-test
+++ b/src/lint/linter/__tests__/jshint/too-many-errors.lint-test
@@ -1,5 +1,5 @@
 /* jshint maxerr: 1 */
 console.log('foobar')
 ~~~~~~~~~~
-disabled:2:22
-warning:2:22
+disabled:2:22:E043
+warning:2:22:W033
diff --git a/src/lint/linter/__tests__/jshint/unnecessary-semicolon.lint-test b/src/lint/linter/__tests__/jshint/unnecessary-semicolon.lint-test
index 14eafbdf..04c627ca 100644
--- a/src/lint/linter/__tests__/jshint/unnecessary-semicolon.lint-test
+++ b/src/lint/linter/__tests__/jshint/unnecessary-semicolon.lint-test
@@ -1,5 +1,5 @@
 function main() {
   return 'Hello, World!';
 };
 ~~~~~~~~~~
-warning:3:2
+warning:3:2:W032
diff --git a/src/lint/linter/__tests__/mergeconflict/mergeconflict.lint-test b/src/lint/linter/__tests__/mergeconflict/mergeconflict.lint-test
index 3e30be52..71b7d4aa 100644
--- a/src/lint/linter/__tests__/mergeconflict/mergeconflict.lint-test
+++ b/src/lint/linter/__tests__/mergeconflict/mergeconflict.lint-test
@@ -1,10 +1,10 @@
 {
     "foo": "bar",
 <<<<<<< HEAD
     "bar": "baz"
 =======
     "baz": "foo"
 >>>>>>> branch2
 }
 ~~~~~~~~~~
-error:5:1
+error:5:1:MERGECONFLICT1:Unresolved merge conflict
diff --git a/src/lint/linter/__tests__/pep8/imports.lint-test b/src/lint/linter/__tests__/pep8/imports.lint-test
index cd9b2287..71f0ad21 100644
--- a/src/lint/linter/__tests__/pep8/imports.lint-test
+++ b/src/lint/linter/__tests__/pep8/imports.lint-test
@@ -1,3 +1,3 @@
 import os, sys
 ~~~~~~~~~~
-error:1:10
+error:1:10:E401
diff --git a/src/lint/linter/__tests__/php/fatal.lint-test b/src/lint/linter/__tests__/php/fatal.lint-test
index cf13b0cd..6d3c7b82 100644
--- a/src/lint/linter/__tests__/php/fatal.lint-test
+++ b/src/lint/linter/__tests__/php/fatal.lint-test
@@ -1,7 +1,7 @@
 <?php
 
 function f() {
   $this = "cannot be re-assigned";
 }
 ~~~~~~~~~
-error:4:
+error:4:0:PHP2:Fatal Error
diff --git a/src/lint/linter/__tests__/php/syntax.lint-test b/src/lint/linter/__tests__/php/syntax.lint-test
index ce6809f3..279fb7af 100644
--- a/src/lint/linter/__tests__/php/syntax.lint-test
+++ b/src/lint/linter/__tests__/php/syntax.lint-test
@@ -1,7 +1,7 @@
 <?php
 
 function f() {
   this is bad syntax;
 }
 ~~~~~~~~~
-error:4:
+error:4:0:PHP1:Parse Error
diff --git a/src/lint/linter/__tests__/pyflakes/pyflakes.lint-test b/src/lint/linter/__tests__/pyflakes/pyflakes.lint-test
index 35d0afea..58765cd4 100644
--- a/src/lint/linter/__tests__/pyflakes/pyflakes.lint-test
+++ b/src/lint/linter/__tests__/pyflakes/pyflakes.lint-test
@@ -1,7 +1,7 @@
 import sys, os
 
 x += 1
 ~~~~~~~~~~
-warning:1:
-warning:1:
-error:3:
+warning:1:0
+warning:1:0
+error:3:0
diff --git a/src/lint/linter/__tests__/pylint/negativechar.lint-test b/src/lint/linter/__tests__/pylint/negativechar.lint-test
index 18b69adb..6a03f740 100644
--- a/src/lint/linter/__tests__/pylint/negativechar.lint-test
+++ b/src/lint/linter/__tests__/pylint/negativechar.lint-test
@@ -1,6 +1,6 @@
 """Docstring"""
 
 """
 Useless string """
 ~~~~~~~~~~
-warning:4:0 See T9257.
+warning:4:0:W0105:Pointless String Statement
diff --git a/src/lint/linter/__tests__/pylint/pylint.lint-test b/src/lint/linter/__tests__/pylint/pylint.lint-test
index 1bd4f202..71dda0ad 100644
--- a/src/lint/linter/__tests__/pylint/pylint.lint-test
+++ b/src/lint/linter/__tests__/pylint/pylint.lint-test
@@ -1,7 +1,9 @@
 import sys, os
 
 x += 1
 ~~~~~~~~~~
-warning:1:0
-advice:1:0
-error:3:0
+advice:1:0:C0111:Missing Docstring
+advice:1:0:C0410:Multiple Imports
+warning:1:0:W0611:Unused Import
+warning:1:0:W0611:Unused Import
+error:3:0:E0602:Undefined Variable
diff --git a/src/lint/linter/__tests__/rubocop/convention.lint-test b/src/lint/linter/__tests__/rubocop/convention.lint-test
index 6d91a080..b924ae29 100644
--- a/src/lint/linter/__tests__/rubocop/convention.lint-test
+++ b/src/lint/linter/__tests__/rubocop/convention.lint-test
@@ -1,4 +1,4 @@
 def hello()
 end
 ~~~~~~~~~~
-warning:1:10
+warning:1:10:-
diff --git a/src/lint/linter/__tests__/ruby/hello.lint-test b/src/lint/linter/__tests__/ruby/hello.lint-test
index eca7dcf1..f6693b6c 100644
--- a/src/lint/linter/__tests__/ruby/hello.lint-test
+++ b/src/lint/linter/__tests__/ruby/hello.lint-test
@@ -1,4 +1,4 @@
 def hello()
   puts "hello world"
 ~~~~~~~~~~
-error:2:
+error:2:0:RUBY:Syntax Error
diff --git a/src/lint/linter/__tests__/spelling/spell.lint-test b/src/lint/linter/__tests__/spelling/spell.lint-test
index 367ba8a5..8b2ed37c 100644
--- a/src/lint/linter/__tests__/spelling/spell.lint-test
+++ b/src/lint/linter/__tests__/spelling/spell.lint-test
@@ -1,20 +1,20 @@
 Hello
 teh
 word
 $y = $x->recieveData();
 for (i=0; i<y.lenght; i++) {
 }
 Check uFT8 ufT8 (<-- repeated)
 
 didn't remove acording
 Added ZZZZsupermnZZZZ
 Added full batmn batmnZZZZ
 ~~~~~~~~~~
-warning:2:1
-warning:4:10
-warning:5:15
-warning:7:7
-warning:7:12
-warning:9:15
-warning:10:11
-warning:11:12
+warning:2:1:SPELL1:Possible Spelling Mistake
+warning:4:10:SPELL2:Possible Spelling Mistake
+warning:5:15:SPELL2:Possible Spelling Mistake
+warning:7:7:SPELL2:Possible Spelling Mistake
+warning:7:12:SPELL2:Possible Spelling Mistake
+warning:9:15:SPELL1:Possible Spelling Mistake
+warning:10:11:SPELL2:Possible Spelling Mistake
+warning:11:12:SPELL1:Possible Spelling Mistake
diff --git a/src/lint/linter/__tests__/text/bad-charset.lint-test b/src/lint/linter/__tests__/text/bad-charset.lint-test
index 9cf661c7..68d30db5 100644
--- a/src/lint/linter/__tests__/text/bad-charset.lint-test
+++ b/src/lint/linter/__tests__/text/bad-charset.lint-test
@@ -1,3 +1,3 @@
 ❤♎☀★☂♞
 ~~~~~~~~~~
-error:1:1
+error:1:1:TXT5:Bad Charset
diff --git a/src/lint/linter/__tests__/text/bof-whitespace-1.lint-test b/src/lint/linter/__tests__/text/bof-whitespace-1.lint-test
index 995aad6b..09d45e9b 100644
--- a/src/lint/linter/__tests__/text/bof-whitespace-1.lint-test
+++ b/src/lint/linter/__tests__/text/bof-whitespace-1.lint-test
@@ -1,9 +1,9 @@
 
 
 
 
 The quick brown fox jumps over the lazy dog.
 ~~~~~~~~~~
-autofix:1:1
+autofix:1:1:TXT8:Leading Whitespace at BOF
 ~~~~~~~~~~
 The quick brown fox jumps over the lazy dog.
diff --git a/src/lint/linter/__tests__/text/dos-newline.lint-test b/src/lint/linter/__tests__/text/dos-newline.lint-test
index 5ff143d0..54669dcc 100644
--- a/src/lint/linter/__tests__/text/dos-newline.lint-test
+++ b/src/lint/linter/__tests__/text/dos-newline.lint-test
@@ -1,7 +1,7 @@
 The quick brown fox
 jumps over the lazy dog.
 ~~~~~~~~~~
-error:1:1
+error:1:1:TXT1:DOS Newlines
 ~~~~~~~~~~
 The quick brown fox
 jumps over the lazy dog.
diff --git a/src/lint/linter/__tests__/text/empty.lint-test b/src/lint/linter/__tests__/text/empty.lint-test
index 546b0f1e..72fb27ca 100644
--- a/src/lint/linter/__tests__/text/empty.lint-test
+++ b/src/lint/linter/__tests__/text/empty.lint-test
@@ -1,4 +1,4 @@
 
 
 ~~~~~~~~~~
-error::
+error:0:0:TXT10:Empty File
diff --git a/src/lint/linter/__tests__/text/eof-whitespace.lint-test b/src/lint/linter/__tests__/text/eof-whitespace.lint-test
index b3b778c7..71115520 100644
--- a/src/lint/linter/__tests__/text/eof-whitespace.lint-test
+++ b/src/lint/linter/__tests__/text/eof-whitespace.lint-test
@@ -1,9 +1,9 @@
 The quick brown fox jumps over the lazy dog.
 
 
 
 
 ~~~~~~~~~~
-autofix:2:1
+autofix:2:1:TXT9:Trailing Whitespace at EOF
 ~~~~~~~~~~
 The quick brown fox jumps over the lazy dog.
diff --git a/src/lint/linter/__tests__/text/line-wrap.lint-test b/src/lint/linter/__tests__/text/line-wrap.lint-test
index f699b82e..8b2a300f 100644
--- a/src/lint/linter/__tests__/text/line-wrap.lint-test
+++ b/src/lint/linter/__tests__/text/line-wrap.lint-test
@@ -1,6 +1,6 @@
 The quick brown fox jumps over the lazy dog.
 ~~~~~~~~~~
-warning:1:1
+warning:1:1:TXT3:Line Too Long
 ~~~~~~~~~~
 ~~~~~~~~~~
 {"config": {"text.max-line-length": 40}}
diff --git a/src/lint/linter/__tests__/text/trailing-whitespace-1.lint-test b/src/lint/linter/__tests__/text/trailing-whitespace-1.lint-test
index 56637cb5..a563fd86 100644
--- a/src/lint/linter/__tests__/text/trailing-whitespace-1.lint-test
+++ b/src/lint/linter/__tests__/text/trailing-whitespace-1.lint-test
@@ -1,8 +1,8 @@
 The quick brown fox 
 jumps over the lazy dog. 
 ~~~~~~~~~~
-autofix:1:20
-autofix:2:25
+autofix:1:20:TXT6:Trailing Whitespace
+autofix:2:25:TXT6:Trailing Whitespace
 ~~~~~~~~~~
 The quick brown fox
 jumps over the lazy dog.
diff --git a/src/lint/linter/__tests__/text/trailing-whitespace-2.lint-test b/src/lint/linter/__tests__/text/trailing-whitespace-2.lint-test
index 0863c187..c8b6bc3e 100644
--- a/src/lint/linter/__tests__/text/trailing-whitespace-2.lint-test
+++ b/src/lint/linter/__tests__/text/trailing-whitespace-2.lint-test
@@ -1,15 +1,15 @@
 Lorem ipsum dolor sit amet,	
 consectetur adipiscing elit.	
 Phasellus sodales nibh erat,	
 in hendrerit nulla dictum interdum.	
 ~~~~~~~~~~
-error:1:28
-autofix:1:28
-autofix:2:29
-autofix:3:29
-autofix:4:36
+error:1:28:TXT2:Tab Literal
+autofix:1:28:TXT6:Trailing Whitespace
+autofix:2:29:TXT6:Trailing Whitespace
+autofix:3:29:TXT6:Trailing Whitespace
+autofix:4:36:TXT6:Trailing Whitespace
 ~~~~~~~~~~
 Lorem ipsum dolor sit amet,
 consectetur adipiscing elit.
 Phasellus sodales nibh erat,
 in hendrerit nulla dictum interdum.
diff --git a/src/lint/linter/__tests__/text/trailing-whitespace-3.lint-test b/src/lint/linter/__tests__/text/trailing-whitespace-3.lint-test
index e92f7bbd..d362c5e2 100644
--- a/src/lint/linter/__tests__/text/trailing-whitespace-3.lint-test
+++ b/src/lint/linter/__tests__/text/trailing-whitespace-3.lint-test
@@ -1,15 +1,15 @@
 Lorem ipsum dolor sit amet,	 	 	 	 	 	
 consectetur adipiscing elit.	      			
 Phasellus sodales nibh erat,	  	
 in hendrerit nulla dictum interdum.    		
 ~~~~~~~~~~
-error:1:28
-autofix:1:28
-autofix:2:29
-autofix:3:29
-autofix:4:36
+error:1:28:TXT2:Tab Literal
+autofix:1:28:TXT6:Trailing Whitespace
+autofix:2:29:TXT6:Trailing Whitespace
+autofix:3:29:TXT6:Trailing Whitespace
+autofix:4:36:TXT6:Trailing Whitespace
 ~~~~~~~~~~
 Lorem ipsum dolor sit amet,
 consectetur adipiscing elit.
 Phasellus sodales nibh erat,
 in hendrerit nulla dictum interdum.
diff --git a/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test b/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test
index 67018229..a585d44a 100644
--- a/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test
+++ b/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test
@@ -1,5 +1,5 @@
 <?php $x ?>
 
 This shouldn't fatal the parser.
 ~~~~~~~~~~
-disabled:2:1
+disabled:2:1:XHP78:Inline HTML
diff --git a/src/lint/linter/__tests__/xhpast/empty.lint-test b/src/lint/linter/__tests__/xhpast/empty.lint-test
index ddbbaebd..22cca1cd 100644
--- a/src/lint/linter/__tests__/xhpast/empty.lint-test
+++ b/src/lint/linter/__tests__/xhpast/empty.lint-test
@@ -1,4 +1,4 @@
 <?php
 
 ~~~~~~~~~~
-warning::
+warning:0:0:XHP82:Empty File
diff --git a/src/lint/linter/__tests__/xhpast/no-segfault-on-abstract.lint-test b/src/lint/linter/__tests__/xhpast/no-segfault-on-abstract.lint-test
index 4bcf93c6..118ce022 100644
--- a/src/lint/linter/__tests__/xhpast/no-segfault-on-abstract.lint-test
+++ b/src/lint/linter/__tests__/xhpast/no-segfault-on-abstract.lint-test
@@ -1,7 +1,7 @@
 <?php
 
 abstract class A {}
 final class F {}
 ~~~~~~~~~~
-disabled:3:1
-disabled:4:1
+disabled:3:1:XHP88:Class Not Extending `Phobject`
+disabled:4:1:XHP88:Class Not Extending `Phobject`
diff --git a/src/lint/linter/__tests__/xhpast/single-pass-adjacent-patches.lint-test b/src/lint/linter/__tests__/xhpast/single-pass-adjacent-patches.lint-test
index 0e66f3f1..9bbce64c 100644
--- a/src/lint/linter/__tests__/xhpast/single-pass-adjacent-patches.lint-test
+++ b/src/lint/linter/__tests__/xhpast/single-pass-adjacent-patches.lint-test
@@ -1,18 +1,22 @@
 <?php
 
 // This test is checking that the LintPatcher correctly applies adjacent patches
 // with large character delta effects.
 function f(                                                             ) {
   g( );
 }
 ~~~~~~~~~~
-warning:5:12
-warning:6:5
+warning:5:12:XHP38:Declaration Formatting
+warning:5:12:XHP25:Spaces Inside Parentheses
+warning:5:12:XHP25:Spaces Inside Parentheses
+warning:6:5:XHP37:Call Formatting
+warning:6:5:XHP25:Spaces Inside Parentheses
+warning:6:5:XHP25:Spaces Inside Parentheses
 ~~~~~~~~~~
 <?php
 
 // This test is checking that the LintPatcher correctly applies adjacent patches
 // with large character delta effects.
 function f() {
   g();
 }
diff --git a/src/lint/linter/__tests__/xhpast/syntax-error.lint-test b/src/lint/linter/__tests__/xhpast/syntax-error.lint-test
index 2108fdd2..7638ed05 100644
--- a/src/lint/linter/__tests__/xhpast/syntax-error.lint-test
+++ b/src/lint/linter/__tests__/xhpast/syntax-error.lint-test
@@ -1,4 +1,4 @@
 <?php
 char *buf = null;
 ~~~~~~~~~~
-error:2:1
+error:2:1:XHP1:PHP Syntax Error!
diff --git a/src/lint/linter/__tests__/xml/almost-empty.lint-test b/src/lint/linter/__tests__/xml/almost-empty.lint-test
index 0b442d19..32ad9f14 100644
--- a/src/lint/linter/__tests__/xml/almost-empty.lint-test
+++ b/src/lint/linter/__tests__/xml/almost-empty.lint-test
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 ~~~~~~~~~~
-error:2:1
+error:2:1:XML4:LibXML Error
diff --git a/src/lint/linter/__tests__/xml/char-ref.lint-test b/src/lint/linter/__tests__/xml/char-ref.lint-test
index a142bbe4..6f4cca9a 100644
--- a/src/lint/linter/__tests__/xml/char-ref.lint-test
+++ b/src/lint/linter/__tests__/xml/char-ref.lint-test
@@ -1,3 +1,3 @@
 <bla>&#010100000000000000000000000000000000000000000000000060;</bla>
 ~~~~~~~~~~
-error:1:63
+error:1:63:XML9:LibXML Error
diff --git a/src/lint/linter/__tests__/xml/languages-5.lint-test b/src/lint/linter/__tests__/xml/languages-5.lint-test
index cf469965..508b4f1a 100644
--- a/src/lint/linter/__tests__/xml/languages-5.lint-test
+++ b/src/lint/linter/__tests__/xml/languages-5.lint-test
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <languages>
     <>
 </languages>
 ~~~~~~~~~~
-error:3:6
+error:3:6:XML68:LibXML Error
diff --git a/src/lint/linter/__tests__/xml/languages-6.lint-test b/src/lint/linter/__tests__/xml/languages-6.lint-test
index 1cdb9519..f652fbb8 100644
--- a/src/lint/linter/__tests__/xml/languages-6.lint-test
+++ b/src/lint/linter/__tests__/xml/languages-6.lint-test
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <languages>
     </lang>
 </languages>
 ~~~~~~~~~~
-error:3:16
-error:4:1
+error:3:16:XML76:LibXML Error
+error:4:1:XML5:LibXML Error
diff --git a/src/lint/linter/xhpast/rules/__tests__/__lambda_func-function/lamba-func-function.lint-test b/src/lint/linter/xhpast/rules/__tests__/__lambda_func-function/lamba-func-function.lint-test
index 554a4034..a65ee01f 100644
--- a/src/lint/linter/xhpast/rules/__tests__/__lambda_func-function/lamba-func-function.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/__lambda_func-function/lamba-func-function.lint-test
@@ -1,5 +1,5 @@
 <?php
 
 function __lambda_func() {}
 ~~~~~~~~~~
-error:3:1
+error:3:1:XHP68:`__lambda_func` Function
diff --git a/src/lint/linter/xhpast/rules/__tests__/__toString-exception/__toString-exception.lint-test b/src/lint/linter/xhpast/rules/__tests__/__toString-exception/__toString-exception.lint-test
index 57626826..dd0c7b50 100644
--- a/src/lint/linter/xhpast/rules/__tests__/__toString-exception/__toString-exception.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/__toString-exception/__toString-exception.lint-test
@@ -1,27 +1,27 @@
 <?php
 
 class MyClass {
   public function __toString() {
     if (some_function()) {
       throw new Exception('Oops');
     }
 
     return __CLASS__;
   }
 }
 
 class MyOtherClass {
   public function __toString() {
     return 'Success';
   }
 }
 
 interface SomeInterface {
   public function __toString();
 }
 
 abstract class SomeAbstractClass {
   abstract public function __toString();
 }
 ~~~~~~~~~~
-error:6:7
+error:6:7:XHP67:Throwing Exception in `__toString` Method
diff --git a/src/lint/linter/xhpast/rules/__tests__/abstract-method-body/body.lint-test b/src/lint/linter/xhpast/rules/__tests__/abstract-method-body/body.lint-test
index 0ffc86e1..3404e1db 100644
--- a/src/lint/linter/xhpast/rules/__tests__/abstract-method-body/body.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/abstract-method-body/body.lint-test
@@ -1,6 +1,6 @@
 <?php
 abstract class SomeClass {
   abstract public function someMethod() {}
 }
 ~~~~~~~~~~
-error:3:41
+error:3:41:XHP108:`abstract` Method Cannot Contain Body
diff --git a/src/lint/linter/xhpast/rules/__tests__/abstract-private-method/abstract-private-method.lint-test b/src/lint/linter/xhpast/rules/__tests__/abstract-private-method/abstract-private-method.lint-test
index ea96208e..2586c5d1 100644
--- a/src/lint/linter/xhpast/rules/__tests__/abstract-private-method/abstract-private-method.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/abstract-private-method/abstract-private-method.lint-test
@@ -1,6 +1,6 @@
 <?php
 abstract class SomeClass {
   private abstract function someMethod();
 }
 ~~~~~~~~~~
-error:3:3
+error:3:3:XHP107:`abstract` Method Cannot Be Declared `private`
diff --git a/src/lint/linter/xhpast/rules/__tests__/alias-functions/alias-functions.lint-test b/src/lint/linter/xhpast/rules/__tests__/alias-functions/alias-functions.lint-test
index d2834524..04ca9135 100644
--- a/src/lint/linter/xhpast/rules/__tests__/alias-functions/alias-functions.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/alias-functions/alias-functions.lint-test
@@ -1,17 +1,17 @@
 <?php
 
 $x = array();
 sizeof($x);
 die();
 sizeOf($x);
 ~~~~~~~~~~
-advice:4:1
-advice:5:1
-advice:6:1
+advice:4:1:XHP65:Alias Functions
+advice:5:1:XHP65:Alias Functions
+advice:6:1:XHP65:Alias Functions
 ~~~~~~~~~~
 <?php
 
 $x = array();
 count($x);
 exit();
 count($x);
diff --git a/src/lint/linter/xhpast/rules/__tests__/array-combine/array-combine.lint-test b/src/lint/linter/xhpast/rules/__tests__/array-combine/array-combine.lint-test
index abcaac70..67d6076f 100644
--- a/src/lint/linter/xhpast/rules/__tests__/array-combine/array-combine.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/array-combine/array-combine.lint-test
@@ -1,6 +1,6 @@
 <?php
 
 array_combine($x, $x);
 array_combine($x, $y);
 ~~~~~~~~~~
-disabled:3:1
+disabled:3:1:XHP84:`array_combine()` Unreliable
diff --git a/src/lint/linter/xhpast/rules/__tests__/array-index-spacing/array-index-spacing.lint-test b/src/lint/linter/xhpast/rules/__tests__/array-index-spacing/array-index-spacing.lint-test
index 7e6f7c80..12ec107f 100644
--- a/src/lint/linter/xhpast/rules/__tests__/array-index-spacing/array-index-spacing.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/array-index-spacing/array-index-spacing.lint-test
@@ -1,16 +1,16 @@
 <?php
 
 $a []= 1;
 $a[] = 1;
 $a[]=1;
 $a [] = 1;
 ~~~~~~~~~~
-warning:3:3
-warning:6:3
+warning:3:3:XHP28:Spacing Before Array Index
+warning:6:3:XHP28:Spacing Before Array Index
 ~~~~~~~~~~
 <?php
 
 $a[]= 1;
 $a[] = 1;
 $a[]=1;
 $a[] = 1;
diff --git a/src/lint/linter/xhpast/rules/__tests__/array-separator/array-separator.lint-test b/src/lint/linter/xhpast/rules/__tests__/array-separator/array-separator.lint-test
index 51128f2e..492d35ac 100644
--- a/src/lint/linter/xhpast/rules/__tests__/array-separator/array-separator.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/array-separator/array-separator.lint-test
@@ -1,81 +1,81 @@
 <?php
 
 array(1, 2, 3);
 array(1, 2, 3,);
 array(
   1,
   2,
   3,
 );
 array(
   1,
   2,
   3 // comment
 );
 array(
   'foo',
   array('foo')
 );
 array(
   'foo' => <<<EOTEXT
 This is some heredoc text.
 EOTEXT
 );
 array(
   1,
   2,
   3);
 array(
   1,
   2,
   3 /* comment */ );
 array(
   1,
   2,
   3, /* comment */ );
 ~~~~~~~~~~
-advice:4:14
-advice:13:3
-advice:17:3
-advice:27:3
-advice:31:3
-advice:35:20
+advice:4:14:XHP48:Array Separator
+advice:13:3:XHP48:Array Separator
+advice:17:3:XHP48:Array Separator
+advice:27:3:XHP48:Array Separator
+advice:31:3:XHP48:Array Separator
+advice:35:20:XHP48:Array Separator
 ~~~~~~~~~~
 <?php
 
 array(1, 2, 3);
 array(1, 2, 3);
 array(
   1,
   2,
   3,
 );
 array(
   1,
   2,
   3, // comment
 );
 array(
   'foo',
   array('foo'),
 );
 array(
   'foo' => <<<EOTEXT
 This is some heredoc text.
 EOTEXT
 );
 array(
   1,
   2,
   3,
 );
 array(
   1,
   2,
   3, /* comment */ 
 );
 array(
   1,
   2,
   3, /* comment */ 
 );
diff --git a/src/lint/linter/xhpast/rules/__tests__/array-value/array-value.lint-test b/src/lint/linter/xhpast/rules/__tests__/array-value/array-value.lint-test
index 9ab10ad7..795a4de0 100644
--- a/src/lint/linter/xhpast/rules/__tests__/array-value/array-value.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/array-value/array-value.lint-test
@@ -1,56 +1,56 @@
 <?php
 
 array(
   1, 2, 3,
 );
 
 array(
   'foo' => 'bar', 'bar' => 'baz',
 );
 
 array(
   1, /* quack */ 2, /* quack */3,
 );
 
 array(
   /* OPEN   */ 1,
   /* CLOSED */ 2,
 );
 
 array('quack',
 );
 ~~~~~~~~~~
-warning:4:5
-warning:4:8
-warning:8:18
-warning:12:17
-warning:12:32
-warning:20:7
+warning:4:5:XHP76:Array Element
+warning:4:8:XHP76:Array Element
+warning:8:18:XHP76:Array Element
+warning:12:17:XHP76:Array Element
+warning:12:32:XHP76:Array Element
+warning:20:7:XHP76:Array Element
 ~~~~~~~~~~
 <?php
 
 array(
   1,
   2,
   3,
 );
 
 array(
   'foo' => 'bar',
   'bar' => 'baz',
 );
 
 array(
   1, /* quack */
   2, /* quack */
   3,
 );
 
 array(
   /* OPEN   */ 1,
   /* CLOSED */ 2,
 );
 
 array(
 'quack',
 );
diff --git a/src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/array.lint-test b/src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/array.lint-test
index 8e0857c9..46fc5b8a 100644
--- a/src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/array.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/array.lint-test
@@ -1,40 +1,40 @@
 <?php
 
 array($x => $y);
 array($x=>$y);
 array($x =>$y);
 array($x=> $y);
 
 array(
   $x => $y,
 );
 array(
   $x =>
     $y,
 );
 array(
   $x=>$y,
 );
 ~~~~~~~~~~
-warning:4:9
-warning:5:10
-warning:6:9
-warning:16:5
+warning:4:9:XHP27:Space Around Binary Operator
+warning:5:10:XHP27:Space Around Binary Operator
+warning:6:9:XHP27:Space Around Binary Operator
+warning:16:5:XHP27:Space Around Binary Operator
 ~~~~~~~~~~
 <?php
 
 array($x => $y);
 array($x => $y);
 array($x => $y);
 array($x => $y);
 
 array(
   $x => $y,
 );
 array(
   $x =>
     $y,
 );
 array(
   $x => $y,
 );
diff --git a/src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/binary-expression-spacing.lint-test b/src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/binary-expression-spacing.lint-test
index 571a5648..3caaab1c 100644
--- a/src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/binary-expression-spacing.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/binary-expression-spacing.lint-test
@@ -1,65 +1,65 @@
 <?php
 
 $a + $b;
 $a+$b;
 $a +$b;
 $a+ $b;
 $a = -$b;
 $a=-$b;
 $a-=$b;
 $a -=$b;
 $a-= $b;
 $a===$b;
 $a.$b;
 function x($n=null) {}
 function x($n = null) {}
 
 $y /* ! */ += // ?
 $z;
 $obj->method();
 Dog::bark();
 $prev = ($total == 1) ? $navids[0] : $navids[$total-1];
 $next = ($total == 1) ? $navids[0] : $navids[$current+1];
 if ($x instanceof z &&$w) {}
 if ($x instanceof z && $w) {}
 f(1,2);
 ~~~~~~~~~~
-warning:4:3
-warning:5:4
-warning:6:3
-warning:8:3
-warning:9:3
-warning:10:4
-warning:11:3
-warning:12:3
-warning:14:14
-warning:21:52
-warning:22:54
-warning:23:21
-warning:25:4
+warning:4:3:XHP27:Space Around Binary Operator
+warning:5:4:XHP27:Space Around Binary Operator
+warning:6:3:XHP27:Space Around Binary Operator
+warning:8:3:XHP27:Space Around Binary Operator
+warning:9:3:XHP27:Space Around Binary Operator
+warning:10:4:XHP27:Space Around Binary Operator
+warning:11:3:XHP27:Space Around Binary Operator
+warning:12:3:XHP27:Space Around Binary Operator
+warning:14:14:XHP27:Space Around Binary Operator
+warning:21:52:XHP27:Space Around Binary Operator
+warning:22:54:XHP27:Space Around Binary Operator
+warning:23:21:XHP27:Space Around Binary Operator
+warning:25:4:XHP27:Space Around Binary Operator
 ~~~~~~~~~~
 <?php
 
 $a + $b;
 $a + $b;
 $a + $b;
 $a + $b;
 $a = -$b;
 $a = -$b;
 $a -= $b;
 $a -= $b;
 $a -= $b;
 $a === $b;
 $a.$b;
 function x($n = null) {}
 function x($n = null) {}
 
 $y /* ! */ += // ?
 $z;
 $obj->method();
 Dog::bark();
 $prev = ($total == 1) ? $navids[0] : $navids[$total - 1];
 $next = ($total == 1) ? $navids[0] : $navids[$current + 1];
 if ($x instanceof z && $w) {}
 if ($x instanceof z && $w) {}
 f(1, 2);
diff --git a/src/lint/linter/xhpast/rules/__tests__/binary-numeric-scalar-casing/binary.lint-test b/src/lint/linter/xhpast/rules/__tests__/binary-numeric-scalar-casing/binary.lint-test
index 406fe97c..8297e01f 100644
--- a/src/lint/linter/xhpast/rules/__tests__/binary-numeric-scalar-casing/binary.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/binary-numeric-scalar-casing/binary.lint-test
@@ -1,5 +1,5 @@
 <?php
 0b1;
 0B1;
 ~~~~~~~~~~
-warning:3:1
+warning:3:1:XHP131:Binary Integer Casing
diff --git a/src/lint/linter/xhpast/rules/__tests__/blacklisted-function/blacklisted-function.lint-test b/src/lint/linter/xhpast/rules/__tests__/blacklisted-function/blacklisted-function.lint-test
index b727afc4..1a2df109 100644
--- a/src/lint/linter/xhpast/rules/__tests__/blacklisted-function/blacklisted-function.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/blacklisted-function/blacklisted-function.lint-test
@@ -1,14 +1,14 @@
 <?php
 
 eval('evil code');
 ~~~~~~~~~~
-error:3:1
+error:3:1:XHP51:Use of Blacklisted Function
 ~~~~~~~~~~
 ~~~~~~~~~~
 {
   "config": {
     "xhpast.blacklisted.function": {
       "eval": "Evil function"
     }
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/brace-formatting/class.lint-test b/src/lint/linter/xhpast/rules/__tests__/brace-formatting/class.lint-test
index 37c94ec9..b7d72894 100644
--- a/src/lint/linter/xhpast/rules/__tests__/brace-formatting/class.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/brace-formatting/class.lint-test
@@ -1,14 +1,14 @@
 <?php
 
 class SomeClass {}
 class SomeOtherClass{}
 class YetAnotherClass extends SomeClass{}
 ~~~~~~~~~~
-warning:4:21
-warning:5:40
+warning:4:21:XHP24:Brace Placement
+warning:5:40:XHP24:Brace Placement
 ~~~~~~~~~~
 <?php
 
 class SomeClass {}
 class SomeOtherClass {}
 class YetAnotherClass extends SomeClass {}
diff --git a/src/lint/linter/xhpast/rules/__tests__/brace-formatting/control-statement.lint-test b/src/lint/linter/xhpast/rules/__tests__/brace-formatting/control-statement.lint-test
index 2454529e..a7c9a5b1 100644
--- a/src/lint/linter/xhpast/rules/__tests__/brace-formatting/control-statement.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/brace-formatting/control-statement.lint-test
@@ -1,53 +1,53 @@
 <?php
 
 if (1)
 {}
 
 foreach (x() as $y)
 {}
 
 while (1)
 {}
 
 switch (1)
 {}
 
 if ($x) foo();
 else bar();
 do baz(); while ($x);
 
 if ($x) {}
 else if ($y) {}
 else {}
 
 if ($x) {}else{}
 ~~~~~~~~~~
-warning:3:7
-warning:6:20
-warning:9:10
-warning:12:11
-warning:15:9
-warning:16:6
-warning:17:4
-warning:19:11
-warning:20:16
-warning:23:11
-warning:23:15
+warning:3:7:XHP24:Brace Placement
+warning:6:20:XHP24:Brace Placement
+warning:9:10:XHP24:Brace Placement
+warning:12:11:XHP24:Brace Placement
+warning:15:9:XHP24:Brace Placement
+warning:16:6:XHP24:Brace Placement
+warning:17:4:XHP24:Brace Placement
+warning:19:11:XHP24:Brace Placement
+warning:20:16:XHP24:Brace Placement
+warning:23:11:XHP24:Brace Placement
+warning:23:15:XHP24:Brace Placement
 ~~~~~~~~~~
 <?php
 
 if (1) {}
 
 foreach (x() as $y) {}
 
 while (1) {}
 
 switch (1) {}
 
 if ($x) foo();
 else bar();
 do baz(); while ($x);
 
 if ($x) {} else if ($y) {} else {}
 
 if ($x) {} else {}
diff --git a/src/lint/linter/xhpast/rules/__tests__/brace-formatting/function.lint-test b/src/lint/linter/xhpast/rules/__tests__/brace-formatting/function.lint-test
index 46ee8076..ff182cf7 100644
--- a/src/lint/linter/xhpast/rules/__tests__/brace-formatting/function.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/brace-formatting/function.lint-test
@@ -1,27 +1,27 @@
 <?php
 
 function f() {
 
 }
 
 function g()
 {
 
 }
 
 function h(){}
 ~~~~~~~~~~
-warning:7:13
-warning:12:13
+warning:7:13:XHP24:Brace Placement
+warning:12:13:XHP24:Brace Placement
 ~~~~~~~~~~
 <?php
 
 function f() {
 
 }
 
 function g() {
 
 }
 
 function h() {}
diff --git a/src/lint/linter/xhpast/rules/__tests__/brace-formatting/try-catch.lint-test b/src/lint/linter/xhpast/rules/__tests__/brace-formatting/try-catch.lint-test
index 7b3f1494..fe667ca2 100644
--- a/src/lint/linter/xhpast/rules/__tests__/brace-formatting/try-catch.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/brace-formatting/try-catch.lint-test
@@ -1,14 +1,14 @@
 <?php
 
 try
 {}
 catch (Exception $x)
 {}
 ~~~~~~~~~~
-warning:3:4
-warning:5:21
+warning:3:4:XHP24:Brace Placement
+warning:5:21:XHP24:Brace Placement
 ~~~~~~~~~~
 <?php
 
 try {}
 catch (Exception $x) {}
diff --git a/src/lint/linter/xhpast/rules/__tests__/call-parentheses/array.lint-test b/src/lint/linter/xhpast/rules/__tests__/call-parentheses/array.lint-test
index b50f6a1c..aef56540 100644
--- a/src/lint/linter/xhpast/rules/__tests__/call-parentheses/array.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/call-parentheses/array.lint-test
@@ -1,15 +1,15 @@
 <?php
 
 array ( 1, 2, 3 );
 list ( $x, $y ) = array();
 [ 1, 2 , 3 ];
 ~~~~~~~~~~
-warning:3:6
-warning:4:5
-warning:4:14
+warning:3:6:XHP37:Call Formatting
+warning:4:5:XHP37:Call Formatting
+warning:4:14:XHP37:Call Formatting
 ~~~~~~~~~~
 <?php
 
 array( 1, 2, 3 );
 list( $x, $y) = array();
 [ 1, 2 , 3 ];
diff --git a/src/lint/linter/xhpast/rules/__tests__/call-parentheses/call-parentheses.lint-test b/src/lint/linter/xhpast/rules/__tests__/call-parentheses/call-parentheses.lint-test
index 3ec2eaa5..b1cef83c 100644
--- a/src/lint/linter/xhpast/rules/__tests__/call-parentheses/call-parentheses.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/call-parentheses/call-parentheses.lint-test
@@ -1,42 +1,42 @@
 <?php
 
 f(1);
 f(1 );
 f(1 /* oh */ );
 f(
   1);
 f(
   1
 );
 array(
   1,
 );
 f(<<<EODOC
 The duck says, "Quack!"
 The robot says, "Beep beep boop boop!"
 EODOC
   );
 f (1);
 ~~~~~~~~~~
-warning:4:4
-warning:9:4
-warning:19:2
+warning:4:4:XHP37:Call Formatting
+warning:9:4:XHP37:Call Formatting
+warning:19:2:XHP37:Call Formatting
 ~~~~~~~~~~
 <?php
 
 f(1);
 f(1);
 f(1 /* oh */ );
 f(
   1);
 f(
   1);
 array(
   1,
 );
 f(<<<EODOC
 The duck says, "Quack!"
 The robot says, "Beep beep boop boop!"
 EODOC
   );
 f(1);
diff --git a/src/lint/linter/xhpast/rules/__tests__/call-time-pass-by-reference/call-time-pass-by-reference.lint-test b/src/lint/linter/xhpast/rules/__tests__/call-time-pass-by-reference/call-time-pass-by-reference.lint-test
index 9f5c9c9a..61135acb 100644
--- a/src/lint/linter/xhpast/rules/__tests__/call-time-pass-by-reference/call-time-pass-by-reference.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/call-time-pass-by-reference/call-time-pass-by-reference.lint-test
@@ -1,33 +1,33 @@
 <?php
 
 class MyClass {
   public function myfunc($var) {
     echo $var;
   }
 }
 
 $myvar = true;
 myfunc(&$myvar);
 myfunc($myvar);
 
 $this->myfunc(&$myvar);
 $this->myfunc($myvar);
 
 MyClass::myfunc(&$myvar);
 MyClass::myfunc($myvar);
 
 while (testfunc($var1, &$var2, $var3, &$var4) === false) {}
 
 sprintf('0%o', 0777 & $p);
 
 $foo(&$myvar);
 
 array_walk(array(), function () use (&$x) {});
 MyClass::myfunc(array(&$x, &$y));
 ~~~~~~~~~~
-error:10:8
-error:13:15
-error:16:17
-error:19:24
-error:19:39
-error:23:6
+error:10:8:XHP53:Call-Time Pass-By-Reference
+error:13:15:XHP53:Call-Time Pass-By-Reference
+error:16:17:XHP53:Call-Time Pass-By-Reference
+error:19:24:XHP53:Call-Time Pass-By-Reference
+error:19:39:XHP53:Call-Time Pass-By-Reference
+error:23:6:XHP53:Call-Time Pass-By-Reference
diff --git a/src/lint/linter/xhpast/rules/__tests__/cast-spacing/cast-spacing.lint-test b/src/lint/linter/xhpast/rules/__tests__/cast-spacing/cast-spacing.lint-test
index bc70f302..0662c526 100644
--- a/src/lint/linter/xhpast/rules/__tests__/cast-spacing/cast-spacing.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/cast-spacing/cast-spacing.lint-test
@@ -1,14 +1,14 @@
 <?php
 
 echo (double)0;
 echo (int) 1;
 echo (string)  2;
 ~~~~~~~~~~
-advice:4:11
-advice:5:14
+advice:4:11:XHP66:Cast Spacing
+advice:5:14:XHP66:Cast Spacing
 ~~~~~~~~~~
 <?php
 
 echo (double)0;
 echo (int)1;
 echo (string)2;
diff --git a/src/lint/linter/xhpast/rules/__tests__/class-extends-object/extends-phobject.lint-test b/src/lint/linter/xhpast/rules/__tests__/class-extends-object/extends-phobject.lint-test
index 3856360f..89ce11a8 100644
--- a/src/lint/linter/xhpast/rules/__tests__/class-extends-object/extends-phobject.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/class-extends-object/extends-phobject.lint-test
@@ -1,7 +1,7 @@
 <?php
 
 abstract class A extends Phobject {}
 final class B extends A {}
 final class C {}
 ~~~~~~~~~~
-disabled:5:1
+disabled:5:1:XHP88:Class Not Extending `Phobject`
diff --git a/src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/should-be-abstract.lint-test b/src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/should-be-abstract.lint-test
index 90861196..4d58000a 100644
--- a/src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/should-be-abstract.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/should-be-abstract.lint-test
@@ -1,6 +1,6 @@
 <?php
 class SomeClass {
   abstract public function someMethod();
 }
 ~~~~~~~~~~
-error:2:1
+error:2:1:XHP113:`class` Containing `abstract` Methods Must Be Declared `abstract`
diff --git a/src/lint/linter/xhpast/rules/__tests__/class-name-literal/class-name-literal.lint-test b/src/lint/linter/xhpast/rules/__tests__/class-name-literal/class-name-literal.lint-test
index 263fa6bc..66bd140b 100644
--- a/src/lint/linter/xhpast/rules/__tests__/class-name-literal/class-name-literal.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/class-name-literal/class-name-literal.lint-test
@@ -1,42 +1,42 @@
 <?php
 
 class MyClass {
   public function someMethod() {
     return 'MyClass';
   }
 
   public function someOtherMethod() {
     $x = 'MyClass is awesome';
     $y = 'MyClassIsAwesome';
     return __CLASS__;
   }
 }
 
 $c = new class {
   public function someMethod() {
     return __CLASS__;
   }
 };
 ~~~~~~~~~~
-advice:5:12
-advice:9:10
+advice:5:12:XHP62:Class Name Literal
+advice:9:10:XHP62:Class Name Literal
 ~~~~~~~~~~
 <?php
 
 class MyClass {
   public function someMethod() {
     return __CLASS__;
   }
 
   public function someOtherMethod() {
     $x = 'MyClass is awesome';
     $y = 'MyClassIsAwesome';
     return __CLASS__;
   }
 }
 
 $c = new class {
   public function someMethod() {
     return __CLASS__;
   }
 };
diff --git a/src/lint/linter/xhpast/rules/__tests__/comment-style/hash-comments.lint-test b/src/lint/linter/xhpast/rules/__tests__/comment-style/hash-comments.lint-test
index 636e36bc..c1294333 100644
--- a/src/lint/linter/xhpast/rules/__tests__/comment-style/hash-comments.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/comment-style/hash-comments.lint-test
@@ -1,51 +1,51 @@
 <?php
 
 # no
 #no
 // yes
 # no
 /* yes */ #no
 /*
  * yes
  */
 /**
  * yes
  */
 //#yes
 /*#yes*/
 #
 //
 /////////////////// yes
 /*no */
 /**no */
 /** yes */
 /**** yes ****/
 ~~~~~~~~~~
-error:3:1
-error:4:1
-error:6:1
-error:7:11
-error:16:1
+error:3:1:XHP18:Comment Style
+error:4:1:XHP18:Comment Style
+error:6:1:XHP18:Comment Style
+error:7:11:XHP18:Comment Style
+error:16:1:XHP18:Comment Style
 ~~~~~~~~~~
 <?php
 
 // no
 // no
 // yes
 // no
 /* yes */ // no
 /*
  * yes
  */
 /**
  * yes
  */
 //#yes
 /*#yes*/
 //
 //
 /////////////////// yes
 /*no */
 /**no */
 /** yes */
 /**** yes ****/
diff --git a/src/lint/linter/xhpast/rules/__tests__/concatenation-operator/concatenation-operator.lint-test b/src/lint/linter/xhpast/rules/__tests__/concatenation-operator/concatenation-operator.lint-test
index c2530902..9e0fbce4 100644
--- a/src/lint/linter/xhpast/rules/__tests__/concatenation-operator/concatenation-operator.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/concatenation-operator/concatenation-operator.lint-test
@@ -1,26 +1,26 @@
 <?php
 
 $a.$b;
 $a . $b;
 $a. $b;
 $a .$b;
 $a.
 $b;
 $a.   // This should be okay.
 $b;
 ~~~~~~~~~~
-warning:4:3
-warning:4:5
-warning:5:4
-warning:6:3
+warning:4:3:XHP44:Concatenation Spacing
+warning:4:5:XHP44:Concatenation Spacing
+warning:5:4:XHP44:Concatenation Spacing
+warning:6:3:XHP44:Concatenation Spacing
 ~~~~~~~~~~
 <?php
 
 $a.$b;
 $a.$b;
 $a.$b;
 $a.$b;
 $a.
 $b;
 $a.   // This should be okay.
 $b;
diff --git a/src/lint/linter/xhpast/rules/__tests__/constructor-parentheses/constructor-parentheses.lint-test b/src/lint/linter/xhpast/rules/__tests__/constructor-parentheses/constructor-parentheses.lint-test
index 5bfa198d..d4cad182 100644
--- a/src/lint/linter/xhpast/rules/__tests__/constructor-parentheses/constructor-parentheses.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/constructor-parentheses/constructor-parentheses.lint-test
@@ -1,16 +1,16 @@
 <?php
 
 new Foo;
 new Bar();
 new Foo\Bar;
 new class {};
 ~~~~~~~~~~
-advice:3:5
-advice:5:5
+advice:3:5:XHP49:Constructor Parentheses
+advice:5:5:XHP49:Constructor Parentheses
 ~~~~~~~~~~
 <?php
 
 new Foo();
 new Bar();
 new Foo\Bar();
 new class {};
diff --git a/src/lint/linter/xhpast/rules/__tests__/continue-inside-switch/continue-inside-switch-1-valid.lint-test b/src/lint/linter/xhpast/rules/__tests__/continue-inside-switch/continue-inside-switch-1-valid.lint-test
index 6a9f040f..7a280f1d 100644
--- a/src/lint/linter/xhpast/rules/__tests__/continue-inside-switch/continue-inside-switch-1-valid.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/continue-inside-switch/continue-inside-switch-1-valid.lint-test
@@ -1,21 +1,20 @@
 <?php
 
 // These are valid loops which you can "continue;" inside.
 
 for ($x = 0; $x < 3; $x++) {
   continue;
 }
 
 foreach ($x as $y) {
   continue;
 }
 
 while ($x) {
   continue;
 }
 
 do {
   continue;
 } while ($x);
 ~~~~~~~~~~
-~~~~~~~~~~
diff --git a/src/lint/linter/xhpast/rules/__tests__/continue-inside-switch/continue-inside-switch-2-n.lint-test b/src/lint/linter/xhpast/rules/__tests__/continue-inside-switch/continue-inside-switch-2-n.lint-test
index 30647fa6..5a71ab7b 100644
--- a/src/lint/linter/xhpast/rules/__tests__/continue-inside-switch/continue-inside-switch-2-n.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/continue-inside-switch/continue-inside-switch-2-n.lint-test
@@ -1,24 +1,23 @@
 <?php
 
 // It's okay to "continue N;" into a loop, although this is usually not the
 // cleanest way to write code and might be discouraged in the future.
 
 while ($x) {
   switch ($y) {
     case 1:
       continue 2;
   }
 }
 
 // This is invalid, but we don't detect it for now.
 
 switch ($x) {
   case 1:
     switch ($y) {
       case 2:
         continue 2;
     }
     break;
 }
 ~~~~~~~~~~
-~~~~~~~~~~
diff --git a/src/lint/linter/xhpast/rules/__tests__/continue-inside-switch/continue-inside-switch-3-rewrite.lint-test b/src/lint/linter/xhpast/rules/__tests__/continue-inside-switch/continue-inside-switch-3-rewrite.lint-test
index 1f86a8e2..5296303d 100644
--- a/src/lint/linter/xhpast/rules/__tests__/continue-inside-switch/continue-inside-switch-3-rewrite.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/continue-inside-switch/continue-inside-switch-3-rewrite.lint-test
@@ -1,26 +1,26 @@
 <?php
 
 switch ($x) {
   case 1:
     continue;
 }
 
 switch ($x) {
   case 1:
     continue /* CRITICAL: Nuclear launch code is 1234. */ ;
 }
 ~~~~~~~~~~
-error:5:5
-error:10:5
+error:5:5:XHP128:Continue Inside Switch
+error:10:5:XHP128:Continue Inside Switch
 ~~~~~~~~~~
 <?php
 
 switch ($x) {
   case 1:
     break;
 }
 
 switch ($x) {
   case 1:
     break /* CRITICAL: Nuclear launch code is 1234. */ ;
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/control-statement-spacing/control-statement-spacing.lint-test b/src/lint/linter/xhpast/rules/__tests__/control-statement-spacing/control-statement-spacing.lint-test
index 0c4a6e5d..6a533f57 100644
--- a/src/lint/linter/xhpast/rules/__tests__/control-statement-spacing/control-statement-spacing.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/control-statement-spacing/control-statement-spacing.lint-test
@@ -1,66 +1,66 @@
 <?php
 
 if($x) {}
 else{}
 for(;;) {}
 foreach($x as $y) {}
 while($x) {}
 do{} while($x);
 switch($x) {}
 if ($x) {}
 else if ($y) {}
 else if ($z) {}
 
 if  ($x) {}
 if
 
 ($x) {}
 if ($x) {
   echo 100;
 } else {
   echo 10;
 }
 do {
   echo 1;
 } while(true);
 
 try {} catch(Exception $ex) {}
 ~~~~~~~~~~
-warning:3:1
-warning:4:1
-warning:5:1
-warning:6:1
-warning:7:1
-warning:8:1
-warning:8:6
-warning:9:1
-warning:14:3
-warning:15:3
-warning:25:3
-warning:27:8
+warning:3:1:XHP26:Space After Control Statement
+warning:4:1:XHP26:Space After Control Statement
+warning:5:1:XHP26:Space After Control Statement
+warning:6:1:XHP26:Space After Control Statement
+warning:7:1:XHP26:Space After Control Statement
+warning:8:1:XHP26:Space After Control Statement
+warning:8:6:XHP26:Space After Control Statement
+warning:9:1:XHP26:Space After Control Statement
+warning:14:3:XHP26:Space After Control Statement
+warning:15:3:XHP26:Space After Control Statement
+warning:25:3:XHP26:Space After Control Statement
+warning:27:8:XHP26:Space After Control Statement
 ~~~~~~~~~~
 <?php
 
 if ($x) {}
 else {}
 for (;;) {}
 foreach ($x as $y) {}
 while ($x) {}
 do {} while ($x);
 switch ($x) {}
 if ($x) {}
 else if ($y) {}
 else if ($z) {}
 
 if ($x) {}
 if ($x) {}
 if ($x) {
   echo 100;
 } else {
   echo 10;
 }
 do {
   echo 1;
 } while (true);
 
 try {} catch (Exception $ex) {}
diff --git a/src/lint/linter/xhpast/rules/__tests__/curly-brace-array-index/array.lint-test b/src/lint/linter/xhpast/rules/__tests__/curly-brace-array-index/array.lint-test
index 0d2ec94d..44ee3b64 100644
--- a/src/lint/linter/xhpast/rules/__tests__/curly-brace-array-index/array.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/curly-brace-array-index/array.lint-test
@@ -1,9 +1,9 @@
 <?php
 $x['key'];
 $y{'key'};
 ~~~~~~~~~~
-warning:3:1
+warning:3:1:XHP119:Curly Brace Array Index
 ~~~~~~~~~~
 <?php
 $x['key'];
 $y['key'];
diff --git a/src/lint/linter/xhpast/rules/__tests__/curly-brace-array-index/nested.lint-test b/src/lint/linter/xhpast/rules/__tests__/curly-brace-array-index/nested.lint-test
index 7f56597f..b4d35d79 100644
--- a/src/lint/linter/xhpast/rules/__tests__/curly-brace-array-index/nested.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/curly-brace-array-index/nested.lint-test
@@ -1,7 +1,7 @@
 <?php
 $x[$y{'key'}];
 ~~~~~~~~~~
-warning:2:4
+warning:2:4:XHP119:Curly Brace Array Index
 ~~~~~~~~~~
 <?php
 $x[$y['key']];
diff --git a/src/lint/linter/xhpast/rules/__tests__/curly-brace-array-index/whitespace.lint-test b/src/lint/linter/xhpast/rules/__tests__/curly-brace-array-index/whitespace.lint-test
index a078e314..50a25e61 100644
--- a/src/lint/linter/xhpast/rules/__tests__/curly-brace-array-index/whitespace.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/curly-brace-array-index/whitespace.lint-test
@@ -1,7 +1,7 @@
 <?php
 $x { 'key' /* comment */ };
 ~~~~~~~~~~
-warning:2:1
+warning:2:1:XHP119:Curly Brace Array Index
 ~~~~~~~~~~
 <?php
 $x [ 'key' /* comment */ ];
diff --git a/src/lint/linter/xhpast/rules/__tests__/declaration-parentheses/declaration-parentheses.lint-test b/src/lint/linter/xhpast/rules/__tests__/declaration-parentheses/declaration-parentheses.lint-test
index df520a44..57b96c96 100644
--- a/src/lint/linter/xhpast/rules/__tests__/declaration-parentheses/declaration-parentheses.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/declaration-parentheses/declaration-parentheses.lint-test
@@ -1,64 +1,64 @@
 <?php
 
 function f($x) {}
 function g($x ) {}
 function h ($x) {}
 
 function &i($x) {}
 function &j($x ) {}
 
 final class X {
 
   public function a($x) {}
   public function b($x ) {}
 
   public static function &c($x) {}
   public static function &d($x ) {}
 
   abstract private function e($x);
   abstract private function f($x );
 
 }
 
 f(function ($x) {});
 f(function ($x ) {});
 f(function ($x ) use ($z) {});
 f(function ($x)use($z) {});
 ~~~~~~~~~~
-warning:4:14
-warning:5:11
-warning:8:15
-warning:13:23
-warning:16:31
-warning:19:33
-warning:24:15
-warning:25:15
-warning:26:16
-warning:26:19
+warning:4:14:XHP38:Declaration Formatting
+warning:5:11:XHP38:Declaration Formatting
+warning:8:15:XHP38:Declaration Formatting
+warning:13:23:XHP38:Declaration Formatting
+warning:16:31:XHP38:Declaration Formatting
+warning:19:33:XHP38:Declaration Formatting
+warning:24:15:XHP38:Declaration Formatting
+warning:25:15:XHP38:Declaration Formatting
+warning:26:16:XHP38:Declaration Formatting
+warning:26:19:XHP38:Declaration Formatting
 ~~~~~~~~~~
 <?php
 
 function f($x) {}
 function g($x) {}
 function h($x) {}
 
 function &i($x) {}
 function &j($x) {}
 
 final class X {
 
   public function a($x) {}
   public function b($x) {}
 
   public static function &c($x) {}
   public static function &d($x) {}
 
   abstract private function e($x);
   abstract private function f($x);
 
 }
 
 f(function ($x) {});
 f(function ($x) {});
 f(function ($x) use ($z) {});
 f(function ($x) use ($z) {});
diff --git a/src/lint/linter/xhpast/rules/__tests__/default-parameters/default-parameters.lint-test b/src/lint/linter/xhpast/rules/__tests__/default-parameters/default-parameters.lint-test
index faeb7466..4a9ec06f 100644
--- a/src/lint/linter/xhpast/rules/__tests__/default-parameters/default-parameters.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/default-parameters/default-parameters.lint-test
@@ -1,12 +1,12 @@
 <?php
 
 function foo($x, $y, $z) {}
 function bar($x, $y = null, $z) {}
 function baz($x = null, $y = null, $z = null) {}
 
 class MyClass {
   public function myMethod($x, $y = null, $z) {}
 }
 ~~~~~~~~~~
-warning:4:13
-warning:8:27
+warning:4:13:XHP60:Default Parameters
+warning:8:27:XHP60:Default Parameters
diff --git a/src/lint/linter/xhpast/rules/__tests__/deprecation/deprecated-function.lint-test b/src/lint/linter/xhpast/rules/__tests__/deprecation/deprecated-function.lint-test
index bd0133ad..fdd718ad 100644
--- a/src/lint/linter/xhpast/rules/__tests__/deprecation/deprecated-function.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/deprecation/deprecated-function.lint-test
@@ -1,15 +1,15 @@
 <?php
 
 deprecated_function();
 modern_function();
 ~~~~~~~~~~
-warning:3:1
+warning:3:1:XHP85:Use of Deprecated Function
 ~~~~~~~~~~
 ~~~~~~~~~~
 {
   "config": {
     "xhpast.deprecated.functions": {
       "deprecated_function": "This function is deprecated."
     }
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/double-quote/double-quote.lint-test b/src/lint/linter/xhpast/rules/__tests__/double-quote/double-quote.lint-test
index 4559b32f..5b8aea42 100644
--- a/src/lint/linter/xhpast/rules/__tests__/double-quote/double-quote.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/double-quote/double-quote.lint-test
@@ -1,31 +1,31 @@
 <?php
 
 'foobar';
 "foo\"bar";
 "foobar\n";
 "'foobar'";
 "foo{$bar}";
 'foo"bar"';
 pht(
   "This string requires \x12\x34 double quotes, but ".
   "this string does not. Here, they are used for consistency.");
 pht(
   "This string also requires \123\345 double quotes, but ".
   "this string does not. Here, they are used for consistency.");
 ~~~~~~~~~~
-advice:4:1
+advice:4:1:XHP41:Unnecessary Double Quotes
 ~~~~~~~~~~
 <?php
 
 'foobar';
 'foo"bar';
 "foobar\n";
 "'foobar'";
 "foo{$bar}";
 'foo"bar"';
 pht(
   "This string requires \x12\x34 double quotes, but ".
   "this string does not. Here, they are used for consistency.");
 pht(
   "This string also requires \123\345 double quotes, but ".
   "this string does not. Here, they are used for consistency.");
diff --git a/src/lint/linter/xhpast/rules/__tests__/duplicate-keys-in-array/duplicate-keys-in-array.lint-test b/src/lint/linter/xhpast/rules/__tests__/duplicate-keys-in-array/duplicate-keys-in-array.lint-test
index d2a7c4ce..67eb27f6 100644
--- a/src/lint/linter/xhpast/rules/__tests__/duplicate-keys-in-array/duplicate-keys-in-array.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/duplicate-keys-in-array/duplicate-keys-in-array.lint-test
@@ -1,43 +1,43 @@
 <?php
 
 $a = array(
   'a' => 'val1',
   $a => 'val2',
   'a' => val3(),
   1 => val4(),
   '1' => val5(),
   1 => $val6,
   'b' => 'val7',
   b() => 'val8',
 );
 static $b = array(
   1 => 'one',
   2 => 'two',
   2 => 'TWO',
 );
 $c = array();
 $d = array(
   A => 'ay',
   A => 'aye',
   'A' => 'AYE',
 );
 $e = array(
   self::B => 'bee',
   self::B => 'bea',
   self::b() => 'ehh',
   self::$b => 'weh',
   B => 'b',
   C::B => 'cb',
 );
 $f = array(
   $a => 'var',
   'a' => 'lit',
   $a => 'var2',
 );
 ~~~~~~~~~~
-error:6:3
-error:9:3
-error:16:3
-error:21:3
-error:26:3
-error:35:3
+error:6:3:XHP22:Duplicate Keys in Array
+error:9:3:XHP22:Duplicate Keys in Array
+error:16:3:XHP22:Duplicate Keys in Array
+error:21:3:XHP22:Duplicate Keys in Array
+error:26:3:XHP22:Duplicate Keys in Array
+error:35:3:XHP22:Duplicate Keys in Array
diff --git a/src/lint/linter/xhpast/rules/__tests__/duplicate-switch-case/duplicate-switch-case.lint-test b/src/lint/linter/xhpast/rules/__tests__/duplicate-switch-case/duplicate-switch-case.lint-test
index 2c8e5c5c..2d95b899 100644
--- a/src/lint/linter/xhpast/rules/__tests__/duplicate-switch-case/duplicate-switch-case.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/duplicate-switch-case/duplicate-switch-case.lint-test
@@ -1,29 +1,29 @@
 <?php
 
 $x = null;
 $y = null;
 switch ($x) {}
 switch ($x) {
   case 1:     break;
   case '1':   break;
   case true:  break;
   case null:  break;
   default:    break;
 }
 switch ($x) {
   case 'foo': break;
   case 'bar': break;
   case 'foo': break;
 
   default:
     switch ($y) {
       case 'foo': break;
       case 'bar': break;
       case 'baz': break;
       case 'baz': break;
     }
     break;
 }
 ~~~~~~~~~~
-error:16:3
-error:23:7
+error:16:3:XHP50:Duplicate Case Statements
+error:23:7:XHP50:Duplicate Case Statements
diff --git a/src/lint/linter/xhpast/rules/__tests__/dynamic-define/dynamic-define.lint-test b/src/lint/linter/xhpast/rules/__tests__/dynamic-define/dynamic-define.lint-test
index 3ac083f3..d88c1692 100644
--- a/src/lint/linter/xhpast/rules/__tests__/dynamic-define/dynamic-define.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/dynamic-define/dynamic-define.lint-test
@@ -1,9 +1,9 @@
 <?php
 
 define('PONY', 'cute');
 define($pony, 'cute');
 define('PONY', $cute);
 define($pony, $cute);
 ~~~~~~~~~~
-error:4:8 dynamic define
-error:6:8 dynamic define
+error:4:8:XHP12:Dynamic `define`
+error:6:8:XHP12:Dynamic `define`
diff --git a/src/lint/linter/xhpast/rules/__tests__/elseif-usage/elseif-usage.lint-test b/src/lint/linter/xhpast/rules/__tests__/elseif-usage/elseif-usage.lint-test
index d906f96d..828bfd85 100644
--- a/src/lint/linter/xhpast/rules/__tests__/elseif-usage/elseif-usage.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/elseif-usage/elseif-usage.lint-test
@@ -1,21 +1,21 @@
 <?php
 
 if (true) {
   echo 'foo';
 } elseif (false) {
   echo 'bar';
 } else if (null) {
   echo 'baz';
 }
 ~~~~~~~~~~
-advice:5:3
+advice:5:3:XHP42:`elseif` Usage
 ~~~~~~~~~~
 <?php
 
 if (true) {
   echo 'foo';
 } else if (false) {
   echo 'bar';
 } else if (null) {
   echo 'baz';
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/empty-statement/empty-statement.lint-test b/src/lint/linter/xhpast/rules/__tests__/empty-statement/empty-statement.lint-test
index 3d352005..6559f5b8 100644
--- a/src/lint/linter/xhpast/rules/__tests__/empty-statement/empty-statement.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/empty-statement/empty-statement.lint-test
@@ -1,23 +1,23 @@
 <?php
 
 function w() {}
 function x() {
   // This is deliberately empty.
 }
 function y() { }
 function z() {
 
 
 }
 ~~~~~~~~~~
-advice:7:14
-advice:8:14
+advice:7:14:XHP47:Empty Block Statement
+advice:8:14:XHP47:Empty Block Statement
 ~~~~~~~~~~
 <?php
 
 function w() {}
 function x() {
   // This is deliberately empty.
 }
 function y() {}
 function z() {}
diff --git a/src/lint/linter/xhpast/rules/__tests__/exit-expression/exit-expression.lint-test b/src/lint/linter/xhpast/rules/__tests__/exit-expression/exit-expression.lint-test
index eef5a6d3..32643f06 100644
--- a/src/lint/linter/xhpast/rules/__tests__/exit-expression/exit-expression.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/exit-expression/exit-expression.lint-test
@@ -1,8 +1,8 @@
 <?php
 
 exit(-1);
 exit -1;
 strtoupper(33 * exit - 6);
 ~~~~~~~~~~
-error:4:1
-error:5:17
+error:4:1:XHP17:`exit` Used as Expression
+error:5:17:XHP17:`exit` Used as Expression
diff --git a/src/lint/linter/xhpast/rules/__tests__/extract-use/extract-use.lint-test b/src/lint/linter/xhpast/rules/__tests__/extract-use/extract-use.lint-test
index 43f13e6c..5d12bcf9 100644
--- a/src/lint/linter/xhpast/rules/__tests__/extract-use/extract-use.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/extract-use/extract-use.lint-test
@@ -1,5 +1,5 @@
 <?php
 
 extract();
 ~~~~~~~~~~
-error:3:1
+error:3:1:XHP4:Use of `extract`
diff --git a/src/lint/linter/xhpast/rules/__tests__/formatted-string/formatted-string.lint-test b/src/lint/linter/xhpast/rules/__tests__/formatted-string/formatted-string.lint-test
index 92ccd54f..388d6d63 100644
--- a/src/lint/linter/xhpast/rules/__tests__/formatted-string/formatted-string.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/formatted-string/formatted-string.lint-test
@@ -1,28 +1,28 @@
 <?php
 
 printf();
 printf(null);
 printf('');
 
 sprintf('%s');
 pht('%s', 'foo', 'bar');
 
 fprintf(null, 'x');
 queryfx(null, 'x', 'y');
 
 foobar(null, null, '%s');
 ~~~~~~~~~~
-error:3:1
-error:7:1
-error:8:1
-error:11:1
-error:13:1
+error:3:1:XHP54:Formatted String
+error:7:1:XHP54:Formatted String
+error:8:1:XHP54:Formatted String
+error:11:1:XHP54:Formatted String
+error:13:1:XHP54:Formatted String
 ~~~~~~~~~~
 ~~~~~~~~~~
 {
   "config": {
     "xhpast.printf-functions": {
       "foobar": 2
     }
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/base.lint-test b/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/base.lint-test
index 8514c10f..8d6f22f6 100644
--- a/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/base.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/base.lint-test
@@ -1,12 +1,12 @@
 <?php
 intval($x);
 intval($x, 8);
 intval($x, 10);
 ~~~~~~~~~~
-advice:2:1
-advice:4:1
+advice:2:1:XHP105:Function Call Should Be Type Cast
+advice:4:1:XHP105:Function Call Should Be Type Cast
 ~~~~~~~~~~
 <?php
 (int)$x;
 intval($x, 8);
 (int)$x;
diff --git a/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/binary-expression.lint-test b/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/binary-expression.lint-test
index b3fbc1f9..d80139dc 100644
--- a/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/binary-expression.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/binary-expression.lint-test
@@ -1,7 +1,7 @@
 <?php
 intval($x / 2) + 1;
 ~~~~~~~~~~
-advice:2:1
+advice:2:1:XHP105:Function Call Should Be Type Cast
 ~~~~~~~~~~
 <?php
 (int)($x / 2) + 1;
diff --git a/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/cast-functions.lint-test b/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/cast-functions.lint-test
index 805c6200..079591cf 100644
--- a/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/cast-functions.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/cast-functions.lint-test
@@ -1,19 +1,19 @@
 <?php
 boolval($x);
 doubleval($x);
 floatval($x);
 intval($x);
 strval($x);
 ~~~~~~~~~~
-advice:2:1
-advice:3:1
-advice:4:1
-advice:5:1
-advice:6:1
+advice:2:1:XHP105:Function Call Should Be Type Cast
+advice:3:1:XHP105:Function Call Should Be Type Cast
+advice:4:1:XHP105:Function Call Should Be Type Cast
+advice:5:1:XHP105:Function Call Should Be Type Cast
+advice:6:1:XHP105:Function Call Should Be Type Cast
 ~~~~~~~~~~
 <?php
 (bool)$x;
 (double)$x;
 (double)$x;
 (int)$x;
 (string)$x;
diff --git a/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/parameter-mismatch.lint-test b/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/parameter-mismatch.lint-test
index 9af460f0..c1baccf6 100644
--- a/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/parameter-mismatch.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/function-call-should-be-type-cast/parameter-mismatch.lint-test
@@ -1,11 +1,11 @@
 <?php
 // If the function call doesn't have exactly one parameter,
 // we don't provide an autofix.
 strval($x, $y);
 ~~~~~~~~~~
-advice:4:1
+advice:4:1:XHP105:Function Call Should Be Type Cast
 ~~~~~~~~~~
 <?php
 // If the function call doesn't have exactly one parameter,
 // we don't provide an autofix.
 strval($x, $y);
diff --git a/src/lint/linter/xhpast/rules/__tests__/global-variable/global-variable.lint-test b/src/lint/linter/xhpast/rules/__tests__/global-variable/global-variable.lint-test
index 11e7a213..3979f932 100644
--- a/src/lint/linter/xhpast/rules/__tests__/global-variable/global-variable.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/global-variable/global-variable.lint-test
@@ -1,9 +1,9 @@
 <?php
 
 global $BASE_URL;
 function foo() {
   global $x, $y;
 }
 ~~~~~~~~~~
-warning:3:1
-warning:5:3
+warning:3:1:XHP79:Global Variables
+warning:5:3:XHP79:Global Variables
diff --git a/src/lint/linter/xhpast/rules/__tests__/hexadecimal-numeric-scalar-casing/hexadecimal.lint-test b/src/lint/linter/xhpast/rules/__tests__/hexadecimal-numeric-scalar-casing/hexadecimal.lint-test
index aae5eec7..a8c2c10d 100644
--- a/src/lint/linter/xhpast/rules/__tests__/hexadecimal-numeric-scalar-casing/hexadecimal.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/hexadecimal-numeric-scalar-casing/hexadecimal.lint-test
@@ -1,12 +1,12 @@
 <?php
 0xFF;
 0xff;
 0XFF;
 ~~~~~~~~~~
-warning:3:1
-warning:4:1
+warning:3:1:XHP127:Hexadecimal Integer Casing
+warning:4:1:XHP127:Hexadecimal Integer Casing
 ~~~~~~~~~~
 <?php
 0xFF;
 0xFF;
 0xFF;
diff --git a/src/lint/linter/xhpast/rules/__tests__/implicit-constructor/implicit-constructor.lint-test b/src/lint/linter/xhpast/rules/__tests__/implicit-constructor/implicit-constructor.lint-test
index fa42ce26..400f3faf 100644
--- a/src/lint/linter/xhpast/rules/__tests__/implicit-constructor/implicit-constructor.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/implicit-constructor/implicit-constructor.lint-test
@@ -1,9 +1,9 @@
 <?php
 
 final class Platypus {
   public function platypus() {
     // This method must be renamed to __construct().
   }
 }
 ~~~~~~~~~~
-error:4:19
+error:4:19:XHP10:Implicit Constructor
diff --git a/src/lint/linter/xhpast/rules/__tests__/implicit-fallthrough/implicit-fallthrough.lint-test b/src/lint/linter/xhpast/rules/__tests__/implicit-fallthrough/implicit-fallthrough.lint-test
index 6c6fa944..818d9960 100644
--- a/src/lint/linter/xhpast/rules/__tests__/implicit-fallthrough/implicit-fallthrough.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/implicit-fallthrough/implicit-fallthrough.lint-test
@@ -1,100 +1,100 @@
 <?php
 
 $x = 0;
 $y = 0;
 
 switch ($x) {
   case 1:
     $x++;
     continue;
   case 2:
     $x++;
     break;
   case 3:
     $x++;
     return;
   case 4:
     $x++;
     throw new Exception('!');
   case 5:
     break 2;
   case 6:
     continue 2;
   case 7:
   case 8:
     $x++;
     break;
   case 9:
     $x++;
     /* fallthrough */
   case 10:
     $x++;
     break;
   case 11:
     $x++;
     exit(1);
   default:
     break;
 }
 
 switch ($x) {
   case 1:
     $x++;
   case 2:
     break;
 }
 
 switch ($x) {
   default:
     $x++;
 }
 
 switch ($x) {
   case 1:
     while (true) {
       break;
     }
   case 2:
     switch ($y) {
       case 1:
         break;
     }
   case 3:
     while (true) {
       return;
     }
   case 4:
     function f() { throw new Exception(); }
     g(function () { return; });
     final class C { public function m() { return; } }
     interface I {}
   case 5:
     do {
       break;
     } while (true);
   case 6:
     // We accept this "false" positive because the construction is bizarre and
     // the author can easily add an unreachable "break;" for clarity.
     do {
       break 2;
     } while (true);
   case 7:
     /* fallthrough */
   case 8:
     throw_exception();
 }
 ~~~~~~~~~~
-warning:41:3
-warning:48:3
-warning:53:3
-warning:57:3
-warning:66:3
-warning:71:3
-warning:75:3
+warning:41:3:XHP30:Implicit Fallthrough
+warning:48:3:XHP30:Implicit Fallthrough
+warning:53:3:XHP30:Implicit Fallthrough
+warning:57:3:XHP30:Implicit Fallthrough
+warning:66:3:XHP30:Implicit Fallthrough
+warning:71:3:XHP30:Implicit Fallthrough
+warning:75:3:XHP30:Implicit Fallthrough
 ~~~~~~~~~~
 ~~~~~~~~~~
 {
   "config":{
     "xhpast.switchhook":"ArcanistTestXHPASTLintSwitchHook"
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/implicit-visibility/implicit-visibility.lint-test b/src/lint/linter/xhpast/rules/__tests__/implicit-visibility/implicit-visibility.lint-test
index 03139666..29ff8e04 100644
--- a/src/lint/linter/xhpast/rules/__tests__/implicit-visibility/implicit-visibility.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/implicit-visibility/implicit-visibility.lint-test
@@ -1,30 +1,30 @@
 <?php
 
 final class Foo {
   public function bar() {}
   function baz() {}
   abstract function a();
   private static function b() {}
 
   var $x;
   static $y;
   private $z;
 }
 ~~~~~~~~~~
-advice:5:3
-advice:6:3
-advice:9:3
-advice:10:3
+advice:5:3:XHP52:Implicit Method Visibility
+advice:6:3:XHP52:Implicit Method Visibility
+advice:9:3:XHP52:Implicit Method Visibility
+advice:10:3:XHP52:Implicit Method Visibility
 ~~~~~~~~~~
 <?php
 
 final class Foo {
   public function bar() {}
   public function baz() {}
   public abstract function a();
   private static function b() {}
 
   public $x;
   public static $y;
   private $z;
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/inline-html/inline-html.lint-test b/src/lint/linter/xhpast/rules/__tests__/inline-html/inline-html.lint-test
index 13cdd0d1..3c580835 100644
--- a/src/lint/linter/xhpast/rules/__tests__/inline-html/inline-html.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/inline-html/inline-html.lint-test
@@ -1,4 +1,4 @@
 #!/usr/bin/env php
 <html>
 ~~~~~~~~~~
-disabled:2:1
+disabled:2:1:XHP78:Inline HTML
diff --git a/src/lint/linter/xhpast/rules/__tests__/inner-function/inner-function.lint-test b/src/lint/linter/xhpast/rules/__tests__/inner-function/inner-function.lint-test
index 6294eb0a..d4f73fc1 100644
--- a/src/lint/linter/xhpast/rules/__tests__/inner-function/inner-function.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/inner-function/inner-function.lint-test
@@ -1,14 +1,14 @@
 <?php
 
 function outer() {
   if (!function_exists('inner')) {
     function inner() {}
   }
 }
 
 // Closures are allowed.
 function my_func($foo) {
   function () {};
 }
 ~~~~~~~~~~
-warning:5:5
+warning:5:5:XHP59:Inner Functions
diff --git a/src/lint/linter/xhpast/rules/__tests__/instanceof-operator/instanceof-operator.lint-test b/src/lint/linter/xhpast/rules/__tests__/instanceof-operator/instanceof-operator.lint-test
index 62d6a867..53ecc82a 100644
--- a/src/lint/linter/xhpast/rules/__tests__/instanceof-operator/instanceof-operator.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/instanceof-operator/instanceof-operator.lint-test
@@ -1,10 +1,10 @@
 <?php
 
 var_dump('foobar' instanceof stdClass);
 var_dump(123 instanceof stdClass);
 var_dump(null instanceof stdClass);
 var_dump($x instanceof stdClass);
 ~~~~~~~~~~
-error:3:10
-error:4:10
-error:5:10
+error:3:10:XHP69:`instanceof` Operator
+error:4:10:XHP69:`instanceof` Operator
+error:5:10:XHP69:`instanceof` Operator
diff --git a/src/lint/linter/xhpast/rules/__tests__/interface-abstract-method/abstract.lint-test b/src/lint/linter/xhpast/rules/__tests__/interface-abstract-method/abstract.lint-test
index 91180e9e..7ee0956f 100644
--- a/src/lint/linter/xhpast/rules/__tests__/interface-abstract-method/abstract.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/interface-abstract-method/abstract.lint-test
@@ -1,7 +1,7 @@
 <?php
 
 interface SomeInterface {
   abstract public function someMethod();
 }
 ~~~~~~~~~~
-error:4:3
+error:4:3:XHP118:`interface` Methods Cannot Be Marked `abstract`
diff --git a/src/lint/linter/xhpast/rules/__tests__/interface-method-body/body.lint-test b/src/lint/linter/xhpast/rules/__tests__/interface-method-body/body.lint-test
index 2baa5cd5..2f9398ea 100644
--- a/src/lint/linter/xhpast/rules/__tests__/interface-method-body/body.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/interface-method-body/body.lint-test
@@ -1,7 +1,7 @@
 <?php
 
 interface SomeInterface {
   public function someMethod() {}
 }
 ~~~~~~~~~~
-error:4:32
+error:4:32:XHP114:`interface` Method Cannot Contain Body
diff --git a/src/lint/linter/xhpast/rules/__tests__/invalid-default-parameter/invalid-default-parameter.lint-test b/src/lint/linter/xhpast/rules/__tests__/invalid-default-parameter/invalid-default-parameter.lint-test
index ecd63967..6e090166 100644
--- a/src/lint/linter/xhpast/rules/__tests__/invalid-default-parameter/invalid-default-parameter.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/invalid-default-parameter/invalid-default-parameter.lint-test
@@ -1,18 +1,18 @@
 <?php
 
 function func_one(array $x) {}
 function func_two(array $x = null) {}
 function func_three(array $x = array()) {}
 function func_four(array $x = false) {}
 
 function func_five(callable $x) {}
 function func_six(callable $x = null) {}
 function func_seven(callable $x = false) {}
 
 function func_eight(stdClass $x) {}
 function func_nine(stdClass $x = null) {}
 function func_ten(stdClass $x = array()) {}
 ~~~~~~~~~~
-error:6:31
-error:10:35
-error:14:33
+error:6:31:XHP70:Invalid Default Parameter
+error:10:35:XHP70:Invalid Default Parameter
+error:14:33:XHP70:Invalid Default Parameter
diff --git a/src/lint/linter/xhpast/rules/__tests__/invalid-modifiers/invalid-modifiers.lint-test b/src/lint/linter/xhpast/rules/__tests__/invalid-modifiers/invalid-modifiers.lint-test
index b461bb39..1490d748 100644
--- a/src/lint/linter/xhpast/rules/__tests__/invalid-modifiers/invalid-modifiers.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/invalid-modifiers/invalid-modifiers.lint-test
@@ -1,18 +1,18 @@
 <?php
 
 class SomeClass {
   public $a;
   public public $b;
   public protected $c;
   private abstract $d;
 
   public function foo() {}
   public protected function bar() {}
   abstract final public function baz() {}
 }
 ~~~~~~~~~~
-error:5:10
-error:6:10
-error:7:11
-error:10:10
-error:11:12
+error:5:10:XHP72:Invalid Modifiers
+error:6:10:XHP72:Invalid Modifiers
+error:7:11:XHP72:Invalid Modifiers
+error:10:10:XHP72:Invalid Modifiers
+error:11:12:XHP72:Invalid Modifiers
diff --git a/src/lint/linter/xhpast/rules/__tests__/invalid-octal-numeric-scalar/octal.lint-test b/src/lint/linter/xhpast/rules/__tests__/invalid-octal-numeric-scalar/octal.lint-test
index a5bd509d..0ca10e61 100644
--- a/src/lint/linter/xhpast/rules/__tests__/invalid-octal-numeric-scalar/octal.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/invalid-octal-numeric-scalar/octal.lint-test
@@ -1,7 +1,7 @@
 <?php
 01234567;
 08;
 -08;
 ~~~~~~~~
-error:3:1
-error:4:2
+error:3:1:XHP125:Invalid Octal Numeric Scalar
+error:4:2:XHP125:Invalid Octal Numeric Scalar
diff --git a/src/lint/linter/xhpast/rules/__tests__/is_a-should-be-instanceof/is_a.lint-test b/src/lint/linter/xhpast/rules/__tests__/is_a-should-be-instanceof/is_a.lint-test
index 3362c41c..452eb238 100644
--- a/src/lint/linter/xhpast/rules/__tests__/is_a-should-be-instanceof/is_a.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/is_a-should-be-instanceof/is_a.lint-test
@@ -1,16 +1,16 @@
 <?php
 is_a($x, $y);
 is_a($x, 'SomeClass');
 is_a($x, '\\SomeClass');
 is_a($x, '\\'.'Some'.'Class');
 ~~~~~~~~~~
-advice:2:1
-advice:3:1
-advice:4:1
-advice:5:1
+advice:2:1:XHP111:`is_a` Should Be `instanceof`
+advice:3:1:XHP111:`is_a` Should Be `instanceof`
+advice:4:1:XHP111:`is_a` Should Be `instanceof`
+advice:5:1:XHP111:`is_a` Should Be `instanceof`
 ~~~~~~~~~~
 <?php
 $x instanceof $y;
 $x instanceof SomeClass;
 $x instanceof \SomeClass;
 is_a($x, '\\'.'Some'.'Class');
diff --git a/src/lint/linter/xhpast/rules/__tests__/keyword-casing/keyword-casing.lint-test b/src/lint/linter/xhpast/rules/__tests__/keyword-casing/keyword-casing.lint-test
index e813ec40..35d47133 100644
--- a/src/lint/linter/xhpast/rules/__tests__/keyword-casing/keyword-casing.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/keyword-casing/keyword-casing.lint-test
@@ -1,46 +1,46 @@
 <?php
 
 true;
 false;
 null;
 True;
 False;
 NULL;
 nUlL;
 array();
 Array();
 
 function f(array $x, ArRaY $y) {}
 
 new C();
 NeW C();
 
 echo __file__;
 ~~~~~~~~~~
-warning:6:1
-warning:7:1
-warning:8:1
-warning:9:1
-warning:11:1
-warning:13:22
-warning:16:1
-warning:18:6
+warning:6:1:XHP40:Keyword Conventions
+warning:7:1:XHP40:Keyword Conventions
+warning:8:1:XHP40:Keyword Conventions
+warning:9:1:XHP40:Keyword Conventions
+warning:11:1:XHP40:Keyword Conventions
+warning:13:22:XHP40:Keyword Conventions
+warning:16:1:XHP40:Keyword Conventions
+warning:18:6:XHP40:Keyword Conventions
 ~~~~~~~~~~
 <?php
 
 true;
 false;
 null;
 true;
 false;
 null;
 null;
 array();
 array();
 
 function f(array $x, array $y) {}
 
 new C();
 new C();
 
 echo __FILE__;
diff --git a/src/lint/linter/xhpast/rules/__tests__/keyword-casing/parent.lint-test b/src/lint/linter/xhpast/rules/__tests__/keyword-casing/parent.lint-test
index 281f4148..44147f2b 100644
--- a/src/lint/linter/xhpast/rules/__tests__/keyword-casing/parent.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/keyword-casing/parent.lint-test
@@ -1,25 +1,25 @@
 <?php
 
 class Foo extends Bar {
   public static function doSomething() {
     return PARENT::doSomething();
   }
 
   public static function doSomethingElse() {
     return parent::doSomethingElse();
   }
 }
 ~~~~~~~~~~
-warning:5:12
+warning:5:12:XHP40:Keyword Conventions
 ~~~~~~~~~~
 <?php
 
 class Foo extends Bar {
   public static function doSomething() {
     return parent::doSomething();
   }
 
   public static function doSomethingElse() {
     return parent::doSomethingElse();
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/keyword-casing/self.lint-test b/src/lint/linter/xhpast/rules/__tests__/keyword-casing/self.lint-test
index 59692bd3..b90573ba 100644
--- a/src/lint/linter/xhpast/rules/__tests__/keyword-casing/self.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/keyword-casing/self.lint-test
@@ -1,25 +1,25 @@
 <?php
 
 class Foo extends Bar {
   public static function doSomething() {
     return SELF::doSomethingElse();
   }
 
   public static function doSomethingElse() {
     return self::doSomething();
   }
 }
 ~~~~~~~~~~
-warning:5:12
+warning:5:12:XHP40:Keyword Conventions
 ~~~~~~~~~~
 <?php
 
 class Foo extends Bar {
   public static function doSomething() {
     return self::doSomethingElse();
   }
 
   public static function doSomethingElse() {
     return self::doSomething();
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/language-construct-parentheses/language-construct-parentheses.lint-test b/src/lint/linter/xhpast/rules/__tests__/language-construct-parentheses/language-construct-parentheses.lint-test
index b95f3c20..9b5cae5e 100644
--- a/src/lint/linter/xhpast/rules/__tests__/language-construct-parentheses/language-construct-parentheses.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/language-construct-parentheses/language-construct-parentheses.lint-test
@@ -1,50 +1,50 @@
 <?php
 
 include 'foo.php';
 include_once 'foo.php';
 require 'foo.php';
 require_once 'foo.php';
 echo 'foo';
 
 include('bar.php');
 include_once('bar.php');
 require('bar.php');
 require_once('bar.php');
 echo('bar');
 
 include ('baz.php');
 include_once ('baz.php');
 require ('baz.php');
 require_once ('baz.php');
 echo ('baz');
 ~~~~~~~~~~
-warning:9:8
-warning:10:13
-warning:11:8
-warning:12:13
-warning:13:5
-warning:15:9
-warning:16:14
-warning:17:9
-warning:18:14
-warning:19:6
+warning:9:8:XHP46:Language Construct Parentheses
+warning:10:13:XHP46:Language Construct Parentheses
+warning:11:8:XHP46:Language Construct Parentheses
+warning:12:13:XHP46:Language Construct Parentheses
+warning:13:5:XHP46:Language Construct Parentheses
+warning:15:9:XHP46:Language Construct Parentheses
+warning:16:14:XHP46:Language Construct Parentheses
+warning:17:9:XHP46:Language Construct Parentheses
+warning:18:14:XHP46:Language Construct Parentheses
+warning:19:6:XHP46:Language Construct Parentheses
 ~~~~~~~~~~
 <?php
 
 include 'foo.php';
 include_once 'foo.php';
 require 'foo.php';
 require_once 'foo.php';
 echo 'foo';
 
 include 'bar.php';
 include_once 'bar.php';
 require 'bar.php';
 require_once 'bar.php';
 echo 'bar';
 
 include 'baz.php';
 include_once 'baz.php';
 require 'baz.php';
 require_once 'baz.php';
 echo 'baz';
diff --git a/src/lint/linter/xhpast/rules/__tests__/list-assignment/list-assignment.lint-test b/src/lint/linter/xhpast/rules/__tests__/list-assignment/list-assignment.lint-test
index 769e95de..8b647ddd 100644
--- a/src/lint/linter/xhpast/rules/__tests__/list-assignment/list-assignment.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/list-assignment/list-assignment.lint-test
@@ -1,13 +1,13 @@
 <?php
 
 list($x, $y, , ,) = array();
 list($x, $y, , , $z) = array();
 ~~~~~~~~~~
-warning:3:12
-warning:3:14
-warning:3:16
+warning:3:12:XHP77:List Assignment
+warning:3:14:XHP77:List Assignment
+warning:3:16:XHP77:List Assignment
 ~~~~~~~~~~
 <?php
 
 list($x, $y  ) = array();
 list($x, $y, , , $z) = array();
diff --git a/src/lint/linter/xhpast/rules/__tests__/logical-operators/logical-operators.lint-test b/src/lint/linter/xhpast/rules/__tests__/logical-operators/logical-operators.lint-test
index 5b9dac62..4df0e276 100644
--- a/src/lint/linter/xhpast/rules/__tests__/logical-operators/logical-operators.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/logical-operators/logical-operators.lint-test
@@ -1,22 +1,22 @@
 <?php
 
 $x = false;
 $y = true;
 
 $x and $y;
 $x && $y;
 $x or $y;
 $x || $y;
 ~~~~~~~~~~
-advice:6:4
-advice:8:4
+advice:6:4:XHP58:Logical Operators
+advice:8:4:XHP58:Logical Operators
 ~~~~~~~~~~
 <?php
 
 $x = false;
 $y = true;
 
 $x && $y;
 $x && $y;
 $x || $y;
 $x || $y;
diff --git a/src/lint/linter/xhpast/rules/__tests__/lowercase-functions/lowercase-functions.lint-test b/src/lint/linter/xhpast/rules/__tests__/lowercase-functions/lowercase-functions.lint-test
index dc08b9d2..2a77b1db 100644
--- a/src/lint/linter/xhpast/rules/__tests__/lowercase-functions/lowercase-functions.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/lowercase-functions/lowercase-functions.lint-test
@@ -1,11 +1,11 @@
 <?php
 
 var_dump('');
 Var_Dump('');
 ~~~~~~~~~~
-advice:4:1
+advice:4:1:XHP61:Lowercase Functions
 ~~~~~~~~~~
 <?php
 
 var_dump('');
 var_dump('');
diff --git a/src/lint/linter/xhpast/rules/__tests__/modifier-ordering/modifier-ordering.lint-test b/src/lint/linter/xhpast/rules/__tests__/modifier-ordering/modifier-ordering.lint-test
index ac0927f3..0df87cef 100644
--- a/src/lint/linter/xhpast/rules/__tests__/modifier-ordering/modifier-ordering.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/modifier-ordering/modifier-ordering.lint-test
@@ -1,25 +1,25 @@
 <?php
 
 class Foo {
   public $x;
   static protected $y;
 
   public final function bar() {}
   private function baz() {}
   static final public function foobar() {}
 }
 ~~~~~~~~~~
-advice:5:3
-advice:7:3
-advice:9:3
+advice:5:3:XHP71:Modifier Ordering
+advice:7:3:XHP71:Modifier Ordering
+advice:9:3:XHP71:Modifier Ordering
 ~~~~~~~~~~
 <?php
 
 class Foo {
   public $x;
   protected static $y;
 
   final public function bar() {}
   private function baz() {}
   final public static function foobar() {}
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/class-before-namespace.lint-test b/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/class-before-namespace.lint-test
index 7af115cc..de6871b3 100644
--- a/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/class-before-namespace.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/class-before-namespace.lint-test
@@ -1,5 +1,5 @@
 <?php
 class X {}
 namespace X;
 ~~~~~~~~~~
-error:2:1
+error:2:1:XHP98:`namespace` Statement Must Be The First Statement
diff --git a/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/incorrect.lint-test b/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/incorrect.lint-test
index f2fd0e3b..998aa637 100644
--- a/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/incorrect.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/namespace-first-statement/incorrect.lint-test
@@ -1,16 +1,16 @@
 <?php
 
 /**
  * This is actually perfectly valid, for some unknown reason.
  *
  * TODO: Maybe fix the handling of this edge case.
  */
 
 1;
 
 namespace X {
   class C { }
   echo 2;
 }
 ~~~~~~~~~~
-error:9:1
+error:9:1:XHP98:`namespace` Statement Must Be The First Statement
diff --git a/src/lint/linter/xhpast/rules/__tests__/naming-conventions/constant-case.lint-test b/src/lint/linter/xhpast/rules/__tests__/naming-conventions/constant-case.lint-test
index 420b0292..d4f8d044 100644
--- a/src/lint/linter/xhpast/rules/__tests__/naming-conventions/constant-case.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/naming-conventions/constant-case.lint-test
@@ -1,12 +1,12 @@
 <?php
 
 define('foo', 'bar');
 const bar = 'baz';
 
 class Foo {
   const bar = 'baz';
 }
 ~~~~~~~~~~
-warning:3:8
-warning:4:7
-warning:7:9
+warning:3:8:XHP9:Naming Conventions
+warning:4:7:XHP9:Naming Conventions
+warning:7:9:XHP9:Naming Conventions
diff --git a/src/lint/linter/xhpast/rules/__tests__/naming-conventions/naming-conventions.lint-test b/src/lint/linter/xhpast/rules/__tests__/naming-conventions/naming-conventions.lint-test
index c83a9b00..c05ff347 100644
--- a/src/lint/linter/xhpast/rules/__tests__/naming-conventions/naming-conventions.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/naming-conventions/naming-conventions.lint-test
@@ -1,71 +1,71 @@
 <?php
 
 final class a {
   const b = 1, c = d;
   protected $E, $H;
   public function F($G, $GG) {}
 }
 
 interface i {}
 
 function YY($ZZ) {}
 
 final class Quack {
   const R = 1, S = 2;
   protected $tX, $uY;
   public function vV($w_w) {}
 }
 
 function () use ($this_is_a_closure) {};
 
 function f(&$YY) {}
 
 function g() {
   $lowerCamelCase = 0;
   $UpperCamelCase = 0;
   $UPPERCASE_WITH_UNDERSCORES = 0;
   $lowercase_with_underscores = 0;
   $mIxEd_CaSe = 0;
 }
 
 function h() {
   global $mIxEd_CaSe;
   $mIxEd_CaSe = 2;
   $GLOBALS[0] = 2;
   $_ENV[0] = 1;
 }
 
 function i() {
   self::$X_x;
   Other::$Y_y;
   parent::$Z_z;
   self::$X_x[0];
   Other::$Y_y[0];
   parent::$Z_z[0];
 }
 
 function j() {
   // Test case for bug where any static access would shadow other variables.
   Other::$y = 0;
   $mIxEdCaSe = 1;
 }
 ~~~~~~~~~~
-warning:3:13
-warning:4:9
-warning:4:9
-warning:4:16
-warning:4:16
-warning:5:13
-warning:5:17
-warning:6:19
-warning:6:21
-warning:6:25
-warning:9:11
-warning:11:10
-warning:11:13
-warning:21:13
-warning:24:3
-warning:25:3
-warning:26:3
-warning:28:3
-warning:50:3
+warning:3:13:XHP9:Naming Conventions
+warning:4:9:XHP9:Naming Conventions
+warning:4:9:XHP9:Naming Conventions
+warning:4:16:XHP9:Naming Conventions
+warning:4:16:XHP9:Naming Conventions
+warning:5:13:XHP9:Naming Conventions
+warning:5:17:XHP9:Naming Conventions
+warning:6:19:XHP9:Naming Conventions
+warning:6:21:XHP9:Naming Conventions
+warning:6:25:XHP9:Naming Conventions
+warning:9:11:XHP9:Naming Conventions
+warning:11:10:XHP9:Naming Conventions
+warning:11:13:XHP9:Naming Conventions
+warning:21:13:XHP9:Naming Conventions
+warning:24:3:XHP9:Naming Conventions
+warning:25:3:XHP9:Naming Conventions
+warning:26:3:XHP9:Naming Conventions
+warning:28:3:XHP9:Naming Conventions
+warning:50:3:XHP9:Naming Conventions
diff --git a/src/lint/linter/xhpast/rules/__tests__/nested-namespaces/nested.lint-test b/src/lint/linter/xhpast/rules/__tests__/nested-namespaces/nested.lint-test
index ef3d5757..9617119e 100644
--- a/src/lint/linter/xhpast/rules/__tests__/nested-namespaces/nested.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/nested-namespaces/nested.lint-test
@@ -1,9 +1,9 @@
 <?php
 namespace X {
   namespace Y {
     namespace Z {}
   }
 }
 ~~~~~~~~~~
-error:3:3
-error:4:5
+error:3:3:XHP90:Nested `namespace` Statements
+error:4:5:XHP90:Nested `namespace` Statements
diff --git a/src/lint/linter/xhpast/rules/__tests__/newline-after-open-tag/newline-after-open-tag.lint-test b/src/lint/linter/xhpast/rules/__tests__/newline-after-open-tag/newline-after-open-tag.lint-test
index 4fc49641..be5250b5 100644
--- a/src/lint/linter/xhpast/rules/__tests__/newline-after-open-tag/newline-after-open-tag.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/newline-after-open-tag/newline-after-open-tag.lint-test
@@ -1,24 +1,24 @@
 <?php phpinfo() ?>
 <?    phpinfo(); ?>
 
 <?php
 phpinfo();
 ?>
 
 <?
 phpinfo();
 ~~~~~~~~~~
-advice:4:6
-advice:8:3
+advice:4:6:XHP81:Newline After PHP Open Tag
+advice:8:3:XHP81:Newline After PHP Open Tag
 ~~~~~~~~~~
 <?php phpinfo() ?>
 <?    phpinfo(); ?>
 
 <?php
 
 phpinfo();
 ?>
 
 <?
 
 phpinfo();
diff --git a/src/lint/linter/xhpast/rules/__tests__/no-parent-scope/no-parent-scope.lint-test b/src/lint/linter/xhpast/rules/__tests__/no-parent-scope/no-parent-scope.lint-test
index b9389611..fb65df66 100644
--- a/src/lint/linter/xhpast/rules/__tests__/no-parent-scope/no-parent-scope.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/no-parent-scope/no-parent-scope.lint-test
@@ -1,19 +1,19 @@
 <?php
 
 final class MyValidClass extends SomeOtherClass {
   public function __construct() {
     parent::__construct(null);
   }
 }
 
 final class MyInvalidClass {
   public function __construct() {
     parent::__construct(null);
   }
 
   public function someMethod($x) {
     echo $x::SOME_CONSTANT;
   }
 }
 ~~~~~~~~~~
-error:11:5
+error:11:5:XHP64:No Parent Scope
diff --git a/src/lint/linter/xhpast/rules/__tests__/object-operator-spacing/object-operator-spacing.lint-test b/src/lint/linter/xhpast/rules/__tests__/object-operator-spacing/object-operator-spacing.lint-test
index 462f4d42..3e181a6a 100644
--- a/src/lint/linter/xhpast/rules/__tests__/object-operator-spacing/object-operator-spacing.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/object-operator-spacing/object-operator-spacing.lint-test
@@ -1,14 +1,14 @@
 <?php
 
 $x -> doSomething();
 id(new Something())
   ->doSomething();
 ~~~~~~~~~~
-warning:3:3
-warning:3:6
+warning:3:3:XHP74:Object Operator Spacing
+warning:3:6:XHP74:Object Operator Spacing
 ~~~~~~~~~~
 <?php
 
 $x->doSomething();
 id(new Something())
   ->doSomething();
diff --git a/src/lint/linter/xhpast/rules/__tests__/paamayim-nekudotayim-spacing/paamayim-nekudotayim-spacing.lint-test b/src/lint/linter/xhpast/rules/__tests__/paamayim-nekudotayim-spacing/paamayim-nekudotayim-spacing.lint-test
index 7ee65d7b..67a6c11d 100644
--- a/src/lint/linter/xhpast/rules/__tests__/paamayim-nekudotayim-spacing/paamayim-nekudotayim-spacing.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/paamayim-nekudotayim-spacing/paamayim-nekudotayim-spacing.lint-test
@@ -1,36 +1,36 @@
 <?php
 
 class Foo extends Bar {
   public function bar() {
     echo self::FOOBAR;
     echo self :: FOOBAR;
   }
 }
 
 MyClass::myMethod();
 MyClass :: myMethod();
 
 MyClass::$myProperty;
 MyClass :: $myProperty;
 ~~~~~~~~~~
-warning:6:14
-warning:6:17
-warning:11:8
-warning:11:11
-warning:14:8
-warning:14:11
+warning:6:14:XHP96:Paamayim Nekudotayim Spacing
+warning:6:17:XHP96:Paamayim Nekudotayim Spacing
+warning:11:8:XHP96:Paamayim Nekudotayim Spacing
+warning:11:11:XHP96:Paamayim Nekudotayim Spacing
+warning:14:8:XHP96:Paamayim Nekudotayim Spacing
+warning:14:11:XHP96:Paamayim Nekudotayim Spacing
 ~~~~~~~~~~
 <?php
 
 class Foo extends Bar {
   public function bar() {
     echo self::FOOBAR;
     echo self::FOOBAR;
   }
 }
 
 MyClass::myMethod();
 MyClass::myMethod();
 
 MyClass::$myProperty;
 MyClass::$myProperty;
diff --git a/src/lint/linter/xhpast/rules/__tests__/parent-member-references/parent.lint-test b/src/lint/linter/xhpast/rules/__tests__/parent-member-references/parent.lint-test
index a31fd6b5..492f0955 100644
--- a/src/lint/linter/xhpast/rules/__tests__/parent-member-references/parent.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/parent-member-references/parent.lint-test
@@ -1,15 +1,15 @@
 <?php
 class Foo extends Bar {
   public function someMethod() {
     Bar::someOtherMethod();
   }
 }
 ~~~~~~~~~~
-warning:4:5
+warning:4:5:XHP83:Parent Member Reference
 ~~~~~~~~~~
 <?php
 class Foo extends Bar {
   public function someMethod() {
     parent::someOtherMethod();
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/array.lint-test b/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/array.lint-test
index c23be0b1..750e8c65 100644
--- a/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/array.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/array.lint-test
@@ -1,18 +1,18 @@
 <?php
 
 array ( 1, 2, 3 );
 list ( $x, $y ) = array();
 [ 1, 2 , 3 ];
 ~~~~~~~~~~
-warning:3:8
-warning:3:16
-warning:4:7
-warning:4:14
-warning:5:2
-warning:5:11
+warning:3:8:XHP25:Spaces Inside Parentheses
+warning:3:16:XHP25:Spaces Inside Parentheses
+warning:4:7:XHP25:Spaces Inside Parentheses
+warning:4:14:XHP25:Spaces Inside Parentheses
+warning:5:2:XHP25:Spaces Inside Parentheses
+warning:5:11:XHP25:Spaces Inside Parentheses
 ~~~~~~~~~~
 <?php
 
 array (1, 2, 3);
 list ($x, $y) = array();
 [1, 2 , 3];
diff --git a/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/parentheses-spacing.lint-test b/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/parentheses-spacing.lint-test
index 784fc828..4642b112 100644
--- a/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/parentheses-spacing.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/parentheses-spacing.lint-test
@@ -1,62 +1,62 @@
 <?php
 
 if ( $x ) {}
 f( );
 q(                      );
 g();
 if ($x) {} else if ( $y ) {}
 
 $obj->m(
   $x,
   $y,
   $z);
 for ( $ii = 0; $ii < 1; $ii++ ) {}
 foreach ( $x as $y ) {}
 function q( $x ) {}
 final class X {
   public function f( $y ) {}
 }
 foreach ( $z as $k => $v ) {}
 some_call( /* respect authorial intent */ $b,
   $a // if comments are present
   );
 ~~~~~~~~~~
-warning:3:5
-warning:3:8
-warning:4:3
-warning:5:3
-warning:7:21
-warning:7:24
-warning:13:6
-warning:13:30
-warning:14:10
-warning:14:19
-warning:15:12
-warning:15:15
-warning:17:21
-warning:17:24
-warning:19:10
-warning:19:25
+warning:3:5:XHP25:Spaces Inside Parentheses
+warning:3:8:XHP25:Spaces Inside Parentheses
+warning:4:3:XHP25:Spaces Inside Parentheses
+warning:5:3:XHP25:Spaces Inside Parentheses
+warning:7:21:XHP25:Spaces Inside Parentheses
+warning:7:24:XHP25:Spaces Inside Parentheses
+warning:13:6:XHP25:Spaces Inside Parentheses
+warning:13:30:XHP25:Spaces Inside Parentheses
+warning:14:10:XHP25:Spaces Inside Parentheses
+warning:14:19:XHP25:Spaces Inside Parentheses
+warning:15:12:XHP25:Spaces Inside Parentheses
+warning:15:15:XHP25:Spaces Inside Parentheses
+warning:17:21:XHP25:Spaces Inside Parentheses
+warning:17:24:XHP25:Spaces Inside Parentheses
+warning:19:10:XHP25:Spaces Inside Parentheses
+warning:19:25:XHP25:Spaces Inside Parentheses
 ~~~~~~~~~~
 <?php
 
 if ($x) {}
 f();
 q();
 g();
 if ($x) {} else if ($y) {}
 
 $obj->m(
   $x,
   $y,
   $z);
 for ($ii = 0; $ii < 1; $ii++) {}
 foreach ($x as $y) {}
 function q($x) {}
 final class X {
   public function f($y) {}
 }
 foreach ($z as $k => $v) {}
 some_call( /* respect authorial intent */ $b,
   $a // if comments are present
   );
diff --git a/src/lint/linter/xhpast/rules/__tests__/parse_str-use/parse_str-use.lint-test b/src/lint/linter/xhpast/rules/__tests__/parse_str-use/parse_str-use.lint-test
index 21afe525..0e7541d6 100644
--- a/src/lint/linter/xhpast/rules/__tests__/parse_str-use/parse_str-use.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/parse_str-use/parse_str-use.lint-test
@@ -1,7 +1,7 @@
 <?php
 
 $params = array();
 parse_str('foo=bar', $params);
 parse_str('foo=bar');
 ~~~~~~~~~~
-error:5:1
+error:5:1:XHP80:Questionable Use of `parse_str`
diff --git a/src/lint/linter/xhpast/rules/__tests__/php-close-tag/php-close-tag.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-close-tag/php-close-tag.lint-test
index 54fb1fc5..2a7ec0a4 100644
--- a/src/lint/linter/xhpast/rules/__tests__/php-close-tag/php-close-tag.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/php-close-tag/php-close-tag.lint-test
@@ -1,5 +1,5 @@
 <?php
 return;
 ?>
 ~~~~~~~~~~
-error:3:1
+error:3:1:XHP8:Use of Close Tag `?>`
diff --git a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/conditional-usage.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/conditional-usage.lint-test
index 6b8a50de..ba34f703 100644
--- a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/conditional-usage.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/conditional-usage.lint-test
@@ -1,32 +1,32 @@
 <?php
 
 if (function_exists('array_column')) {
   array_column(array(), '');
   json_last_error_msg();
 } else {
   array_column(array(), '');
 }
 
 if (class_exists('CURLFile')) {
   new CURLFile('');
   new DateTimeImmutable();
 }
 
 if (function_exists('json_last_error_msg'))
   json_last_error_msg();
 
 // These shouldn't fatal.
 if (SomeClass::someStaticMethod($param)) {}
 $var = 'some_func';
 if ($var()) {}
 ~~~~~~~~~~
-error:5:3
-error:7:3
-error:12:7
+error:5:3:XHP45:PHP Compatibility
+error:7:3:XHP45:PHP Compatibility
+error:12:7:XHP45:PHP Compatibility
 ~~~~~~~~~~
 ~~~~~~~~~~
 {
   "config": {
     "xhpast.php-version": "5.3.0"
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/index-function.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/index-function.lint-test
index fd7b02a2..83d0e3b2 100644
--- a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/index-function.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/index-function.lint-test
@@ -1,12 +1,12 @@
 <?php
 
 f()[0];
 ~~~~~~~~~~
-error:3:5
+error:3:5:XHP45:PHP Compatibility
 ~~~~~~~~~~
 ~~~~~~~~~~
 {
   "config": {
     "xhpast.php-version": "5.3.0"
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/nowdoc.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/nowdoc.lint-test
index 74e25ddc..7895253f 100644
--- a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/nowdoc.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/nowdoc.lint-test
@@ -1,14 +1,14 @@
 <?php
 
 echo <<<'EOT'
 Hello World!
 EOT;
 ~~~~~~~~~~
-error:3:6
+error:3:6:XHP45:PHP Compatibility
 ~~~~~~~~~~
 ~~~~~~~~~~
 {
   "config": {
     "xhpast.php-version": "5.2.3"
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php-compatibility.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php-compatibility.lint-test
index 93ef1aa7..117d2405 100644
--- a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php-compatibility.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php-compatibility.lint-test
@@ -1,14 +1,14 @@
 <?php
 
 define_syslog_variables();
 var_dump(STREAM_ENFORCE_SAFE_MODE);
 ~~~~~~~~~~
-error:3:1
-error:4:10
+error:3:1:XHP45:PHP Compatibility
+error:4:10:XHP45:PHP Compatibility
 ~~~~~~~~~~
 ~~~~~~~~~~
 {
   "config": {
     "xhpast.php-version": "5.4.0"
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php53-features.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php53-features.lint-test
index a867aeab..935e2f21 100644
--- a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php53-features.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php53-features.lint-test
@@ -1,27 +1,27 @@
 <?php
 
 namespace a;
 use b, c;
 f(function () {});
 g(function () use ($c) {});
 static::m();
 1 ? 1 : 2;
 1 ?: 2;
 $a = 'stdClass';
 $a::m();
 echo __DIR__;
 ~~~~~~~~~~
-error:3:1
-error:4:1
-error:5:3
-error:6:3
-error:7:1
-error:9:1
-error:12:6
+error:3:1:XHP45:PHP Compatibility
+error:4:1:XHP45:PHP Compatibility
+error:5:3:XHP45:PHP Compatibility
+error:6:3:XHP45:PHP Compatibility
+error:7:1:XHP45:PHP Compatibility
+error:9:1:XHP45:PHP Compatibility
+error:12:6:XHP45:PHP Compatibility
 ~~~~~~~~~~
 ~~~~~~~~~~
 {
   "config": {
     "xhpast.php-version": "5.2.3"
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php54-features.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php54-features.lint-test
index d7d6a768..292b8ea0 100644
--- a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php54-features.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php54-features.lint-test
@@ -1,40 +1,40 @@
 <?php
 
 f()[0];
     m()[0];
 
 // The check above should be this, see T4334.
 // $o->m()[0];
 
 final class SomeClass extends Phobject {
   public function someMethod() {
     return function () {
       $this->someOtherMethod();
     };
   }
 
   public static function someStaticMethod() {
     return function () {
       self::someOtherMethod();
     };
   }
 }
 
 0b1;
 
 [];
 
 ~~~~~~~~~~
-error:3:5
-error:4:9
-error:12:7
-error:18:7
-error:23:1
-error:25:1
+error:3:5:XHP45:PHP Compatibility
+error:4:9:XHP45:PHP Compatibility
+error:12:7:XHP45:PHP Compatibility
+error:18:7:XHP45:PHP Compatibility
+error:23:1:XHP45:PHP Compatibility
+error:25:1:XHP45:PHP Compatibility
 ~~~~~~~~~~
 ~~~~~~~~~~
 {
   "config": {
     "xhpast.php-version": "5.3.0"
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php54-incompat.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php54-incompat.lint-test
index fb6e3ac6..208adbfa 100644
--- a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php54-incompat.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/php54-incompat.lint-test
@@ -1,18 +1,18 @@
 <?php
 
 break;
 break 0;
 break 1;
 break 1 + foo() * $bar;
 continue;
 continue 0;
 continue 1;
 continue 1 + foo() * $bar;
 ~~~~~~~~~~
-error:4:7
-error:6:7
-error:8:10
-error:10:10
+error:4:7:XHP45:PHP Compatibility
+error:6:7:XHP45:PHP Compatibility
+error:8:10:XHP45:PHP Compatibility
+error:10:10:XHP45:PHP Compatibility
 ~~~~~~~~~~
 ~~~~~~~~~~
 {"config": {"xhpast.php-version": "5.4.0"}}
diff --git a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/windows.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/windows.lint-test
index 3c1fece2..0323aca5 100644
--- a/src/lint/linter/xhpast/rules/__tests__/php-compatibility/windows.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/php-compatibility/windows.lint-test
@@ -1,13 +1,13 @@
 <?php
 
 chroot('/tmp');
 ~~~~~~~~~~
-error:3:1
+error:3:1:XHP45:PHP Compatibility
 ~~~~~~~~~~
 ~~~~~~~~~~
 {
   "config": {
     "xhpast.php-version": "5.2.3",
     "xhpast.php-version.windows": "5.3.0"
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/php-echo-tag/php-echo-tag.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-echo-tag/php-echo-tag.lint-test
index 414db072..b86ed15e 100644
--- a/src/lint/linter/xhpast/rules/__tests__/php-echo-tag/php-echo-tag.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/php-echo-tag/php-echo-tag.lint-test
@@ -1,4 +1,4 @@
 <?=
 
 ~~~~~~~~~~
-error:1:1
+error:1:1:XHP7:Use of Echo Tag `<?=`
diff --git a/src/lint/linter/xhpast/rules/__tests__/php-open-tag/php-open-tag.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-open-tag/php-open-tag.lint-test
index 7fb52e73..b3545879 100644
--- a/src/lint/linter/xhpast/rules/__tests__/php-open-tag/php-open-tag.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/php-open-tag/php-open-tag.lint-test
@@ -1,11 +1,11 @@
 garbage garbage
 <?php
 
 ?>
 ~~~~~~~~~~
-error:1:1
+error:1:1:XHP15:Expected Open Tag
 ~~~~~~~~~~
 garbage garbage
 <?php
 
 ?>
diff --git a/src/lint/linter/xhpast/rules/__tests__/php-short-tag/php-short-tag.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-short-tag/php-short-tag.lint-test
index 9c5fb0c5..1e756cda 100644
--- a/src/lint/linter/xhpast/rules/__tests__/php-short-tag/php-short-tag.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/php-short-tag/php-short-tag.lint-test
@@ -1,6 +1,6 @@
 <?
 ~~~~~~~~~~
-error:1:1
+error:1:1:XHP6:Use of Short Tag `<?`
 ~~~~~~~~~~
 <?php
 
diff --git a/src/lint/linter/xhpast/rules/__tests__/plus-operator-on-strings/plus-operator-on-strings.lint-test b/src/lint/linter/xhpast/rules/__tests__/plus-operator-on-strings/plus-operator-on-strings.lint-test
index 3910c597..ff25cb5b 100644
--- a/src/lint/linter/xhpast/rules/__tests__/plus-operator-on-strings/plus-operator-on-strings.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/plus-operator-on-strings/plus-operator-on-strings.lint-test
@@ -1,10 +1,10 @@
 <?php
 
 'a'.'b';
 'a' + 'b';
 'a' + $x;
 $x + $y + $z + 'q' + 0;
 ~~~~~~~~~~
-error:4:1
-error:5:1
-error:6:1
+error:4:1:XHP21:Not String Concatenation
+error:5:1:XHP21:Not String Concatenation
+error:6:1:XHP21:Not String Concatenation
diff --git a/src/lint/linter/xhpast/rules/__tests__/preg_quote-misuse/preg_quote-misuse.lint-test b/src/lint/linter/xhpast/rules/__tests__/preg_quote-misuse/preg_quote-misuse.lint-test
index 11672af4..4df4f718 100644
--- a/src/lint/linter/xhpast/rules/__tests__/preg_quote-misuse/preg_quote-misuse.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/preg_quote-misuse/preg_quote-misuse.lint-test
@@ -1,11 +1,11 @@
 <?php
 
 function foo($bar) {
   preg_quote($bar);
   preg_quote($bar, '/');
   preg_Quote('moo');
   preg_quote('moo', '/');
 }
 ~~~~~~~~~~
-advice:4:3 Wrong number of arguments to preg_quote()
-advice:6:3 Wrong number of arguments to preg_quote()
+advice:4:3:XHP14:Misuse of `preg_quote`
+advice:6:3:XHP14:Misuse of `preg_quote`
diff --git a/src/lint/linter/xhpast/rules/__tests__/public-property/class.lint-test b/src/lint/linter/xhpast/rules/__tests__/public-property/class.lint-test
index a7921aff..0cdb9950 100644
--- a/src/lint/linter/xhpast/rules/__tests__/public-property/class.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/public-property/class.lint-test
@@ -1,9 +1,9 @@
 <?php
 
 class SomeClass {
   private $x;
   protected $y;
   public $z;
 }
 ~~~~~~~~~~
-advice:6:3
+advice:6:3:XHP130:Use of `public` Properties
diff --git a/src/lint/linter/xhpast/rules/__tests__/ragged-classtree-edge/ragged-classtree-edge.lint-test b/src/lint/linter/xhpast/rules/__tests__/ragged-classtree-edge/ragged-classtree-edge.lint-test
index facdc3b5..4c46f2ef 100644
--- a/src/lint/linter/xhpast/rules/__tests__/ragged-classtree-edge/ragged-classtree-edge.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/ragged-classtree-edge/ragged-classtree-edge.lint-test
@@ -1,12 +1,12 @@
 <?php
 
 class A extends Phobject {}
 abstract class B extends Phobject {}
 final class C extends Phobject {}
 
 /**
  * @concrete-extensible
  */
 class D extends Phobject {}
 ~~~~~~~~~~
-disabled:3:7
+disabled:3:7:XHP87:Class Not `abstract` Or `final`
diff --git a/src/lint/linter/xhpast/rules/__tests__/reused-as-iterator/reused-as-iterator.lint-test b/src/lint/linter/xhpast/rules/__tests__/reused-as-iterator/reused-as-iterator.lint-test
index 2e9c6ba4..c5a0e66f 100644
--- a/src/lint/linter/xhpast/rules/__tests__/reused-as-iterator/reused-as-iterator.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/reused-as-iterator/reused-as-iterator.lint-test
@@ -1,67 +1,67 @@
 <?php
 
 function f($stuff, $thing) {
   foreach ($stuff as $ii) {}
 
   // OK: Only reused for iteration.
 
   foreach ($stuff as $ii) {}
 }
 
 function g($stuff, $thing) {
   foreach ($stuff as $thing) {}
 
   // OK: Not reused later.
 }
 
 function h($stuff, $thing) {
 
   // OK: Used afterwards but not before.
 
   foreach ($stuff as $key => $val) {}
 
   $key = 1;
   $thing = 1;
   $thing = $key;
   $key = $thing;
 }
 
 function i($stuff, $thing) {
   foreach ($stuff as $thing) {
     $thing++;
   }
 
   // OK: Used afterwards but inside loop.
 
   foreach ($stuff as $thing) {
     $thing++;
   }
 }
 
 function j($stuff, $thing) {
 
   foreach ($stuff as $thing) {
     break;
   }
 
   // ERROR: Clobbers $thing; probably not what the author intended.
 
   f($thing);
 }
 
 function k($stuff, $thing) {
   foreach ($stuff as $thing) {
     break;
   }
 
   // ERROR: Clobbers $thing. Test case to cover some errors of implementation
   // where subsequent legitimate foreach()es threw a wrench in the gears.
 
   f($thing);
 
   $other = array();
   foreach ($other as $item) {}
 }
 ~~~~~~~~~~
-error:43:22
-error:53:22
+error:43:22:XHP32:Variable Reused As Iterator
+error:53:22:XHP32:Variable Reused As Iterator
diff --git a/src/lint/linter/xhpast/rules/__tests__/reused-iterator-reference/reused-iterator-reference.lint-test b/src/lint/linter/xhpast/rules/__tests__/reused-iterator-reference/reused-iterator-reference.lint-test
index 0bc4c345..be42a429 100644
--- a/src/lint/linter/xhpast/rules/__tests__/reused-iterator-reference/reused-iterator-reference.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/reused-iterator-reference/reused-iterator-reference.lint-test
@@ -1,130 +1,130 @@
 <?php
 
 function assign() {
   $ar = array();
   foreach ($ar as &$a) {}
   $a = 1; // Reuse of $a.
 }
 
 function expr() {
   $ar = array();
   foreach ($ar as &$a) {}
   $b = $a; // Reuse of $a.
 }
 
 function func_call() {
   $ar = array();
   foreach ($ar as &$a) {}
   $b = x($a); // Reuse of $a.
 }
 
 function x($b) {}
 
 function iterator_reuse() {
   $ar1 = array();
   $ar2 = array();
   foreach ($ar1 as &$a) {}
   foreach ($ar2 as $a) {} // Reuse of $a
 }
 
 function key_value() {
   $ar = array();
   foreach ($ar as $k => &$v) {}
   $v++; // Reuse of $v
 }
 
 function key_value2() {
   $ar = array();
   foreach ($ar as $k => $v) {}
   $v++;
 }
 
 function unset() {
   $ar = array();
   foreach ($ar as &$a) {}
   unset($a);
   $a++;
 }
 
 function unset2() {
   $ar = array();
   foreach ($ar as &$a) {}
   $a++; // Reuse of $a
   unset($a);
 }
 
 function twice_ref() {
   $ar1 = array();
   $ar2 = array();
   foreach ($ar1 as &$b) {}
   foreach ($ar2 as &$b) {}
 }
 
 function assign_ref(&$a) {
   $ar = array();
   foreach ($ar as &$b) {}
   $b = &$a;
 }
 
 function assign_ref2(&$a) {
   $ar = array();
   foreach ($ar as &$b) {}
   $b = &$a;
   $c = $b;
 }
 
 function use_inside() {
   $ar = array();
   foreach ($ar as &$a) {
     $a++;
   }
 }
 
 function variable_variable() {
   $ar = array();
   foreach ($ar as &$$a) {}
   $a++;
   $$a++;
 }
 
 function closure1() {
   $ar = array();
   foreach ($ar as &$a) {}
   function ($a) {
     $a++;
   };
 }
 
 function closure2() {
   function () {
     $ar = array();
     foreach ($ar as &$a) {}
   };
   $a++;
 }
 
 function closure3() {
   function () {
     $ar = array();
     foreach ($ar as &$a) {}
     $a++; // Reuse of $a
   };
 }
 
 function closure4() {
   $ar = array();
   foreach ($ar as &$a) {}
   function ($a) {
     unset($a);
   };
   $a++; // Reuse of $a
 }
 ~~~~~~~~~~
-warning:6:3
-warning:12:8
-warning:18:10
-warning:27:20
-warning:33:3
-warning:52:3
-warning:110:5
-warning:120:3
+warning:6:3:XHP39:Reuse of Iterator References
+warning:12:8:XHP39:Reuse of Iterator References
+warning:18:10:XHP39:Reuse of Iterator References
+warning:27:20:XHP39:Reuse of Iterator References
+warning:33:3:XHP39:Reuse of Iterator References
+warning:52:3:XHP39:Reuse of Iterator References
+warning:110:5:XHP39:Reuse of Iterator References
+warning:120:3:XHP39:Reuse of Iterator References
diff --git a/src/lint/linter/xhpast/rules/__tests__/reused-iterator/reused-iterator.lint-test b/src/lint/linter/xhpast/rules/__tests__/reused-iterator/reused-iterator.lint-test
index 29d31b72..bfe122ce 100644
--- a/src/lint/linter/xhpast/rules/__tests__/reused-iterator/reused-iterator.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/reused-iterator/reused-iterator.lint-test
@@ -1,58 +1,58 @@
 <?php
 
 for ($ii = 0; $ii < $len; $ii++) {
   foreach ($list as $ii => $jj) {
     // Reuse of $ii.
   }
 }
 
 for ($jj = 0; $jj < $len; $jj++) {
   foreach ($list as $jj) {
     // Reuse of $jj.
   }
 }
 
 for ($ii = 0; $ii < $len; $ii++) {
   foreach ($list as $ii => &$jj) {
     // Reuse of $ii.
   }
 }
 
 for ($jj = 0; $jj < $len; $jj++) {
   foreach ($list as &$jj) {
     // Reuse of $jj (by reference).
   }
 }
 
 for ($ii = 0; $ii < $len; $ii++) {
   for ($jj = 0; $jj < $len; $jj++) {
     foreach ($list as $kk) {
       // No reuse.
     }
   }
 }
 
 for ($ii = 0; $ii < $len; $ii++) {
   for ($ii = 0; $ii < $len; $ii++) {
     // Reuse of $ii, pure for loops.
   }
 }
 
 for ($ii = 0; $ii < $len; $ii++) {
   for ($jj = $ii; $jj < $jjlen; $jj++) {
     // No reuse.
   }
 }
 
 foreach ($list as $thing) {
   for ($thing = 0; $thing < $len; $thing++) {
     // Reuse of $thing, for within foreach.
   }
 }
 ~~~~~~~~~~
-error:4:11
-error:10:11
-error:16:11
-error:22:11
-error:36:7
-error:48:7
+error:4:11:XHP23:Reuse of Iterator Variable
+error:10:11:XHP23:Reuse of Iterator Variable
+error:16:11:XHP23:Reuse of Iterator Variable
+error:22:11:XHP23:Reuse of Iterator Variable
+error:36:7:XHP23:Reuse of Iterator Variable
+error:48:7:XHP23:Reuse of Iterator Variable
diff --git a/src/lint/linter/xhpast/rules/__tests__/self-class-reference/self-class-references.lint-test b/src/lint/linter/xhpast/rules/__tests__/self-class-reference/self-class-references.lint-test
index 33c30f4d..8cf29ac3 100644
--- a/src/lint/linter/xhpast/rules/__tests__/self-class-reference/self-class-references.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/self-class-reference/self-class-references.lint-test
@@ -1,37 +1,37 @@
 <?php
 
 class Foo extends Bar {
   public static function newInstance() {
     return new Foo();
   }
 
   public static function init() {
     return new self();
   }
 }
 
 $c = new class {
   public function newInstance() {
     return new self();
   }
 };
 ~~~~~~~~~~
-warning:5:16
+warning:5:16:XHP95:Self Class Reference
 ~~~~~~~~~~
 <?php
 
 class Foo extends Bar {
   public static function newInstance() {
     return new self();
   }
 
   public static function init() {
     return new self();
   }
 }
 
 $c = new class {
   public function newInstance() {
     return new self();
   }
 };
diff --git a/src/lint/linter/xhpast/rules/__tests__/self-member-reference/php54.lint-test b/src/lint/linter/xhpast/rules/__tests__/self-member-reference/php54.lint-test
index f0b46c17..9831ae14 100644
--- a/src/lint/linter/xhpast/rules/__tests__/self-member-reference/php54.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/self-member-reference/php54.lint-test
@@ -1,31 +1,31 @@
 <?php
 
 final class SomeClass extends Phobject {
   public static function someMethod() {
     $closure = function () {
       SomeClass::someOtherMethod();
       self::someOtherMethod();
     };
     $closure();
   }
 }
 ~~~~~~~~~~
-warning:6:7
+warning:6:7:XHP57:Self Member Reference
 ~~~~~~~~~~
 <?php
 
 final class SomeClass extends Phobject {
   public static function someMethod() {
     $closure = function () {
       self::someOtherMethod();
       self::someOtherMethod();
     };
     $closure();
   }
 }
 ~~~~~~~~~~
 {
   "config": {
     "xhpast.php-version": "5.4.0"
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/self-member-reference/self-member-reference.lint-test b/src/lint/linter/xhpast/rules/__tests__/self-member-reference/self-member-reference.lint-test
index 5aef8974..ee9961bd 100644
--- a/src/lint/linter/xhpast/rules/__tests__/self-member-reference/self-member-reference.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/self-member-reference/self-member-reference.lint-test
@@ -1,23 +1,23 @@
 <?php
 
 class Foo extends Bar {
   const FOOBAR = 'FOOBAR';
 
   public function baz() {
     echo Foo::FOOBAR;
     echo self::FOOBAR;
   }
 }
 ~~~~~~~~~~
-warning:7:10
+warning:7:10:XHP57:Self Member Reference
 ~~~~~~~~~~
 <?php
 
 class Foo extends Bar {
   const FOOBAR = 'FOOBAR';
 
   public function baz() {
     echo self::FOOBAR;
     echo self::FOOBAR;
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/semicolon-spacing/semicolon-spacing.lint-test b/src/lint/linter/xhpast/rules/__tests__/semicolon-spacing/semicolon-spacing.lint-test
index 64052864..16091019 100644
--- a/src/lint/linter/xhpast/rules/__tests__/semicolon-spacing/semicolon-spacing.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/semicolon-spacing/semicolon-spacing.lint-test
@@ -1,16 +1,16 @@
 <?php
 
 foo();
 bar() ;
 baz()
 
      ;
 ~~~~~~~~~~
-advice:4:6
-advice:5:6
+advice:4:6:XHP43:Semicolon Spacing
+advice:5:6:XHP43:Semicolon Spacing
 ~~~~~~~~~~
 <?php
 
 foo();
 bar();
 baz();
diff --git a/src/lint/linter/xhpast/rules/__tests__/slowness/slowness.lint-test b/src/lint/linter/xhpast/rules/__tests__/slowness/slowness.lint-test
index 6549eca3..13361ef5 100644
--- a/src/lint/linter/xhpast/rules/__tests__/slowness/slowness.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/slowness/slowness.lint-test
@@ -1,14 +1,14 @@
 <?php
 
 (strpos('a', 'b') === 0);
 (strpos('a', 'b') !== 0);
 (0 === strpos('a', 'b'));
 (1 + 0 === strpos('a', 'b'));
 
 (strstr('a', 'b') === false);
 (strstr('a', 'b') === 'b');
 ~~~~~~~~~~
-warning:3:2
-warning:4:2
-warning:5:8
-warning:8:2
+warning:3:2:XHP36:Slow Construct
+warning:4:2:XHP36:Slow Construct
+warning:5:8:XHP36:Slow Construct
+warning:8:2:XHP36:Slow Construct
diff --git a/src/lint/linter/xhpast/rules/__tests__/static-this/static-this.lint-test b/src/lint/linter/xhpast/rules/__tests__/static-this/static-this.lint-test
index 0eb809da..6c15bb04 100644
--- a/src/lint/linter/xhpast/rules/__tests__/static-this/static-this.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/static-this/static-this.lint-test
@@ -1,12 +1,12 @@
 <?php
 
 final class A {
   public function u() {
     $this->f();
   }
   public static function v() {
     $this->f();
   }
 }
 ~~~~~~~~~~
-error:8:5
+error:8:5:XHP13:Use of `$this` in Static Context
diff --git a/src/lint/linter/xhpast/rules/__tests__/tautological-expression/tautological-expression.lint-test b/src/lint/linter/xhpast/rules/__tests__/tautological-expression/tautological-expression.lint-test
index fa1a7d8e..c9200a3a 100644
--- a/src/lint/linter/xhpast/rules/__tests__/tautological-expression/tautological-expression.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/tautological-expression/tautological-expression.lint-test
@@ -1,23 +1,23 @@
 <?php
 
 if ($x == $x) {}
 
 if ($x->m(3) < $x->m(3)) {}
 
 if ($y[2] - $y[2]) {}
 
 if ($x == $y) {}
 
 // See xhpast 0.54 -> 0.55.
 return $a->sub->value < $b->sub->value;
 
 $skip_cache = true || $some_complicated_expression;
 $skip_cache = $a || $b;
 $skip_cache = false && something();
 $skip_cache = f();
 ~~~~~~~~~~
-error:3:5
-error:5:5
-error:7:5
-error:14:15
-error:16:15
+error:3:5:XHP20:Tautological Expression
+error:5:5:XHP20:Tautological Expression
+error:7:5:XHP20:Tautological Expression
+error:14:15:XHP20:Tautological Expression
+error:16:15:XHP20:Tautological Expression
diff --git a/src/lint/linter/xhpast/rules/__tests__/this-reassignment/class.lint-test b/src/lint/linter/xhpast/rules/__tests__/this-reassignment/class.lint-test
index e4081b0d..a6c96f18 100644
--- a/src/lint/linter/xhpast/rules/__tests__/this-reassignment/class.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/this-reassignment/class.lint-test
@@ -1,8 +1,8 @@
 <?php
 class SomeClass {
   public function __construct() {
     $this = null;
   }
 }
 ~~~~~~~~~~
-error:4:5
+error:4:5:XHP91:`$this` Reassignment
diff --git a/src/lint/linter/xhpast/rules/__tests__/this-reassignment/this.lint-test b/src/lint/linter/xhpast/rules/__tests__/this-reassignment/this.lint-test
index 0a0d38f5..6a3c2ade 100644
--- a/src/lint/linter/xhpast/rules/__tests__/this-reassignment/this.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/this-reassignment/this.lint-test
@@ -1,4 +1,4 @@
 <?php
 $this = null;
 ~~~~~~~~~~
-error:2:1
+error:2:1:XHP91:`$this` Reassignment
diff --git a/src/lint/linter/xhpast/rules/__tests__/todo-comment/todo-comment.lint-test b/src/lint/linter/xhpast/rules/__tests__/todo-comment/todo-comment.lint-test
index 4e7be6dd..ecda219e 100644
--- a/src/lint/linter/xhpast/rules/__tests__/todo-comment/todo-comment.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/todo-comment/todo-comment.lint-test
@@ -1,10 +1,10 @@
 <?php
 
 // TODO: Something goes here.
 
 /**
  * @todo Something else goes here.
  */
 ~~~~~~~~~~
-disabled:3:4
-disabled:6:4
+disabled:3:4:XHP16:TODO Comment
+disabled:6:4:XHP16:TODO Comment
diff --git a/src/lint/linter/xhpast/rules/__tests__/unary-postfix-expression-spacing/unary-postfix-expression-spacing.lint-test b/src/lint/linter/xhpast/rules/__tests__/unary-postfix-expression-spacing/unary-postfix-expression-spacing.lint-test
index d8cd5c24..c102c83c 100644
--- a/src/lint/linter/xhpast/rules/__tests__/unary-postfix-expression-spacing/unary-postfix-expression-spacing.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/unary-postfix-expression-spacing/unary-postfix-expression-spacing.lint-test
@@ -1,11 +1,11 @@
 <?php
 
 $x ++;
 $y--;
 ~~~~~~~~~~
-warning:3:3
+warning:3:3:XHP75:Space Before Unary Postfix Operator
 ~~~~~~~~~~
 <?php
 
 $x++;
 $y--;
diff --git a/src/lint/linter/xhpast/rules/__tests__/unary-prefix-expression-spacing/unary-prefix-expression-spacing.lint-test b/src/lint/linter/xhpast/rules/__tests__/unary-prefix-expression-spacing/unary-prefix-expression-spacing.lint-test
index e30bbe0e..f1080013 100644
--- a/src/lint/linter/xhpast/rules/__tests__/unary-prefix-expression-spacing/unary-prefix-expression-spacing.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/unary-prefix-expression-spacing/unary-prefix-expression-spacing.lint-test
@@ -1,14 +1,14 @@
 <?php
 
 $f = @ fopen($path, 'rb');
 @fclose($f);
 exit ();
 ~~~~~~~~~~
-warning:3:7
-warning:5:5
+warning:3:7:XHP73:Space After Unary Prefix Operator
+warning:5:5:XHP73:Space After Unary Prefix Operator
 ~~~~~~~~~~
 <?php
 
 $f = @fopen($path, 'rb');
 @fclose($f);
 exit();
diff --git a/src/lint/linter/xhpast/rules/__tests__/undeclared-variable/undeclared-variable.lint-test b/src/lint/linter/xhpast/rules/__tests__/undeclared-variable/undeclared-variable.lint-test
index c0447504..6ec0020b 100644
--- a/src/lint/linter/xhpast/rules/__tests__/undeclared-variable/undeclared-variable.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/undeclared-variable/undeclared-variable.lint-test
@@ -1,204 +1,204 @@
 <?php
 
 function () use ($c) {
   $c++;
 };
 
 function f($a, $b) {
   static $c, $d;
   global $e, $f;
   $g = $h = x();
   list($i, list($j, $k)) = y();
   foreach (q() as $l => $m) {}
 
   $a++;
   $b++;
   $c++;
   $d++;
   $e++;
   $f++;
   $g++;
   $h++;
   $i++;
   $j++;
   $k++;
   $l++;
   $m++;
   $this++;
   $n++; // Only one that isn't declared.
 
   extract(z());
 
   $o++;
 }
 
 function g($q) {
   $$q = x();
   $r = y();
 }
 
 final class C {
   public function m() {
     $a++;
     x($b);
     $c[] = 3;
     $d->v = 4;
     $a = $f;
   }
 }
 
 function worst() {
   global $$x;
   $y++;
 }
 
 function superglobals() {
   $GLOBALS[$_FILES[$_POST[$this]]]++;
 }
 
 function ref_foreach($x) {
   foreach ($x as &$z) {}
   $z++;
 }
 
 function has_default($x = 0) {
   $x++;
 }
 
 function declparse(
   $a,
   Q $b,
   Q &$c,
   Q $d = null,
   Q &$e = null,
   $f = null,
   $g = null,
   &$h = null,
   &$i = null) {
   $a++;
   $b++;
   $c++;
   $d++;
   $e++;
   $f++;
   $g++;
   $h++;
   $i++;
   $j++;
 }
 
 function declparse_a(Q $a) { $a++; }
 function declparse_b(Q &$a) { $a++; }
 function declparse_c(Q $a = null) { $a++; }
 function declparse_d(Q &$a = null) { $a++; }
 function declparse_e($a) { $a++; }
 function declparse_f(&$a) { $a++; }
 function declparse_g($a = null) { $a++; }
 function declparse_h(&$a = null) { $a++; }
 
 function static_class() {
   SomeClass::$x;
 }
 
 function instance_class() {
   $a = $this->$x;
 }
 
 function exception_vars() {
   try {
     // This is intentionally left blank.
   } catch (Exception $y) {
     $y++;
   }
 }
 
 function nonuse() {
   isset($x);
   empty($y);
   $x++;
 }
 
 function twice() {
   $y++;
   $y++;
 }
 
 function more_exceptions() {
   try {
     // This is intentionally left blank.
 } catch (Exception $a) {
     $a++;
   } catch (Exception $b) {
     $b++;
   }
 }
 
 abstract class P {
   abstract public function q();
 }
 
 function x() {
   $lib = $_SERVER['PHP_ROOT'].'/lib/titan/display/read/init.php';
   require_once $lib;
   f(((($lib)))); // Tests for paren expressions.
   f(((($lub))));
 }
 
 final class A {
   public function foo($a) {
     $im_service = foo($a);
     if ($im_servce === false) {
       return 1;
     }
     return 2;
   }
 }
 
 function arrow($o, $x) {
   echo $o->{$x->{$x->{$x.$x->{$x}}.$x}};
 }
 
 function strings() {
   $a = 1;
   echo "$a";
   echo "$b";
 }
 
 function catchy() {
   try {
     dangerous();
   } catch (Exception $ex) {
     $y->z();
   }
 }
 
 function some_func($x, $y) {
   $func = function ($z) use ($x) {
     echo $x;
     echo $y;
     echo $z;
   };
 }
 
 function some_func($x, $y) {
   $func = function ($z) use ($x) {
     echo "$x/$y/$z";
   };
 }
 ~~~~~~~~~~
-error:28:3
-error:42:5
-error:43:7
-error:44:5
-error:45:5
-error:46:10
-error:87:3 This stuff is basically testing the lexer/parser for function decls.
-error:104:15 Variables in instance derefs should be checked, static should not.
-error:118:3 isset() and empty() should not trigger errors.
-error:122:3 Should only warn once in this function.
-error:144:8
-error:150:9
-error:164:9
-error:171:5
-error:178:10
-error:185:14
+error:28:3:XHP5:Use of Undeclared Variable
+error:42:5:XHP5:Use of Undeclared Variable
+error:43:7:XHP5:Use of Undeclared Variable
+error:44:5:XHP5:Use of Undeclared Variable
+error:45:5:XHP5:Use of Undeclared Variable
+error:46:10:XHP5:Use of Undeclared Variable
+error:87:3:XHP5:Use of Undeclared Variable
+error:104:15:XHP5:Use of Undeclared Variable
+error:118:3:XHP5:Use of Undeclared Variable
+error:122:3:XHP5:Use of Undeclared Variable
+error:144:8:XHP5:Use of Undeclared Variable
+error:150:9:XHP5:Use of Undeclared Variable
+error:164:9:XHP5:Use of Undeclared Variable
+error:171:5:XHP5:Use of Undeclared Variable
+error:178:10:XHP5:Use of Undeclared Variable
+error:185:14:XHP5:Use of Undeclared Variable
diff --git a/src/lint/linter/xhpast/rules/__tests__/unexpected-return-value/construct.lint-test b/src/lint/linter/xhpast/rules/__tests__/unexpected-return-value/construct.lint-test
index 894c3f6b..e1173e7d 100644
--- a/src/lint/linter/xhpast/rules/__tests__/unexpected-return-value/construct.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/unexpected-return-value/construct.lint-test
@@ -1,8 +1,8 @@
 <?php
 class SomeClass {
   public function __construct() {
     return null;
   }
 }
 ~~~~~~~~~~
-warning:4:5
+warning:4:5:XHP92:Unexpected `return` Value
diff --git a/src/lint/linter/xhpast/rules/__tests__/unexpected-return-value/destruct.lint-test b/src/lint/linter/xhpast/rules/__tests__/unexpected-return-value/destruct.lint-test
index 5b9d7bf6..7c7a4ed7 100644
--- a/src/lint/linter/xhpast/rules/__tests__/unexpected-return-value/destruct.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/unexpected-return-value/destruct.lint-test
@@ -1,8 +1,8 @@
 <?php
 class SomeClass {
   public function __destruct() {
     return null;
   }
 }
 ~~~~~~~~~~
-warning:4:5
+warning:4:5:XHP92:Unexpected `return` Value
diff --git a/src/lint/linter/xhpast/rules/__tests__/unnecessary-final-modifier/unnecessary-final-modifier.lint-test b/src/lint/linter/xhpast/rules/__tests__/unnecessary-final-modifier/unnecessary-final-modifier.lint-test
index 0859d5ab..97fb51e4 100644
--- a/src/lint/linter/xhpast/rules/__tests__/unnecessary-final-modifier/unnecessary-final-modifier.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/unnecessary-final-modifier/unnecessary-final-modifier.lint-test
@@ -1,9 +1,9 @@
 <?php
 
 final class Foo {
   public function bar() {}
   final public function baz() {}
 }
 $c = new class {};
 ~~~~~~~~~~
-advice:5:3
+advice:5:3:XHP55:Unnecessary Final Modifier
diff --git a/src/lint/linter/xhpast/rules/__tests__/unnecessary-symbol-alias/use.lint-test b/src/lint/linter/xhpast/rules/__tests__/unnecessary-symbol-alias/use.lint-test
index a9a25d5c..5aab6a87 100644
--- a/src/lint/linter/xhpast/rules/__tests__/unnecessary-symbol-alias/use.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/unnecessary-symbol-alias/use.lint-test
@@ -1,16 +1,16 @@
 <?php
 use A;
 use B as B;
 use C as D;
 use E\F as F;
 use G\H as I;
 ~~~~~~~~~~
-warning:3:5
-warning:5:5
+warning:3:5:XHP99:Unnecessary Symbol Alias
+warning:5:5:XHP99:Unnecessary Symbol Alias
 ~~~~~~~~~~
 <?php
 use A;
 use B;
 use C as D;
 use E\F;
 use G\H as I;
diff --git a/src/lint/linter/xhpast/rules/__tests__/unsafe-dynamic-string/pht.lint-test b/src/lint/linter/xhpast/rules/__tests__/unsafe-dynamic-string/pht.lint-test
index 3a4b0c34..6bd6ae5e 100644
--- a/src/lint/linter/xhpast/rules/__tests__/unsafe-dynamic-string/pht.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/unsafe-dynamic-string/pht.lint-test
@@ -1,37 +1,37 @@
 <?php
 
 pht('a');
 pht("a");
 pht('a'.'b');
 pht(f());
 pht();
 pht($a);
 pht('a'.$a);
 pht('$a');
 pht("$a");
 pht('%s', $a);
 
 pht(<<<EOT
 a
 EOT
 );
 
 pht(<<<EOT
 $a
 EOT
 );
 ~~~~~~~~~~
-error:6:1
-error:8:1
-error:9:1
-error:11:1
-error:19:1
+error:6:1:XHP86:Unsafe Usage of Dynamic String
+error:8:1:XHP86:Unsafe Usage of Dynamic String
+error:9:1:XHP86:Unsafe Usage of Dynamic String
+error:11:1:XHP86:Unsafe Usage of Dynamic String
+error:19:1:XHP86:Unsafe Usage of Dynamic String
 ~~~~~~~~~~
 ~~~~~~~~~~
 {
   "config": {
     "xhpast.dynamic-string.functions": {
       "pht": 0
     }
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/unsafe-dynamic-string/xsprintf.lint-test b/src/lint/linter/xhpast/rules/__tests__/unsafe-dynamic-string/xsprintf.lint-test
index b4344fe3..dc5d8edc 100644
--- a/src/lint/linter/xhpast/rules/__tests__/unsafe-dynamic-string/xsprintf.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/unsafe-dynamic-string/xsprintf.lint-test
@@ -1,15 +1,15 @@
 <?php
 
 csprintf('x');
 csprintf($x);
 ~~~~~~~~~~
-error:4:1
+error:4:1:XHP86:Unsafe Usage of Dynamic String
 ~~~~~~~~~~
 ~~~~~~~~~~
 {
   "config": {
     "xhpast.dynamic-string.functions": {
       "csprintf": 0
     }
   }
 }
diff --git a/src/lint/linter/xhpast/rules/__tests__/use-statement-namespace-prefix/use.lint-test b/src/lint/linter/xhpast/rules/__tests__/use-statement-namespace-prefix/use.lint-test
index d4d7e63b..b90281ce 100644
--- a/src/lint/linter/xhpast/rules/__tests__/use-statement-namespace-prefix/use.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/use-statement-namespace-prefix/use.lint-test
@@ -1,11 +1,11 @@
 <?php
 namespace SomeNamespace;
 use X\Y\Z;
 use \X\Y\Z;
 ~~~~~~~~~~
-warning:4:5
+warning:4:5:XHP97:`use` Statement Namespace Prefix
 ~~~~~~~~~~
 <?php
 namespace SomeNamespace;
 use X\Y\Z;
 use X\Y\Z;
diff --git a/src/lint/linter/xhpast/rules/__tests__/useless-overriding-method/useless-overriding-method.lint-test b/src/lint/linter/xhpast/rules/__tests__/useless-overriding-method/useless-overriding-method.lint-test
index 3132c00a..4486c5bb 100644
--- a/src/lint/linter/xhpast/rules/__tests__/useless-overriding-method/useless-overriding-method.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/useless-overriding-method/useless-overriding-method.lint-test
@@ -1,27 +1,27 @@
 <?php
 
 final class MyClass extends SomeOtherClass {
   public function __construct() {
     parent::__construct();
   }
 
   public function uselessMethod($x, array $y) {
     return parent::uselessMethod($x, $y);
   }
 
   public function usefulMethod($x, array $y) {
     return parent::usefulMethod($x, null);
   }
 
   public function anotherMethod($x, &$y) {
     return parent::anotherMethod($x, $y);
   }
 
   public function usefulMethodWithDefaultValue($x = null) {
     return parent::usefulMethodWithDefaultValue($x);
   }
 }
 ~~~~~~~~~~
-advice:4:3
-advice:8:3
-advice:16:3
+advice:4:3:XHP63:Useless Overriding Method
+advice:8:3:XHP63:Useless Overriding Method
+advice:16:3:XHP63:Useless Overriding Method
diff --git a/src/lint/linter/xhpast/rules/__tests__/variable-reference-spacing/function-call.lint-test b/src/lint/linter/xhpast/rules/__tests__/variable-reference-spacing/function-call.lint-test
index 35418dd6..ac26a70c 100644
--- a/src/lint/linter/xhpast/rules/__tests__/variable-reference-spacing/function-call.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/variable-reference-spacing/function-call.lint-test
@@ -1,13 +1,13 @@
 <?php
 $x = &some_function();
 $x = & some_function();
 $x = &
         some_function();
 ~~~~~~~~~~
-warning:3:7
-warning:4:7
+warning:3:7:XHP123:Variable Reference Spacing
+warning:4:7:XHP123:Variable Reference Spacing
 ~~~~~~~~~~
 <?php
 $x = &some_function();
 $x = &some_function();
 $x = &some_function();
diff --git a/src/lint/linter/xhpast/rules/__tests__/variable-reference-spacing/variable.lint-test b/src/lint/linter/xhpast/rules/__tests__/variable-reference-spacing/variable.lint-test
index f3eff1da..eea2fbc5 100644
--- a/src/lint/linter/xhpast/rules/__tests__/variable-reference-spacing/variable.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/variable-reference-spacing/variable.lint-test
@@ -1,13 +1,13 @@
 <?php
 $x = &$a;
 $x = & $b;
 $x = &
         $c;
 ~~~~~~~~~~
-warning:3:7
-warning:4:7
+warning:3:7:XHP123:Variable Reference Spacing
+warning:4:7:XHP123:Variable Reference Spacing
 ~~~~~~~~~~
 <?php
 $x = &$a;
 $x = &$b;
 $x = &$c;
diff --git a/src/lint/linter/xhpast/rules/__tests__/variable-variable/variable-variables.lint-test b/src/lint/linter/xhpast/rules/__tests__/variable-variable/variable-variables.lint-test
index 60c06632..be083d1a 100644
--- a/src/lint/linter/xhpast/rules/__tests__/variable-variable/variable-variables.lint-test
+++ b/src/lint/linter/xhpast/rules/__tests__/variable-variable/variable-variables.lint-test
@@ -1,6 +1,6 @@
 <?php
 
 $$foo;
 $obj->$bar; // okay
 ~~~~~~~~~~
-error:3:1
+error:3:1:XHP3:Use of Variable