diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 11cff90a..a69de0b8 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -106,7 +106,7 @@ phutil_register_library_map(array(
     'ArcanistSettings' => 'configuration/ArcanistSettings.php',
     'ArcanistShellCompleteWorkflow' => 'workflow/ArcanistShellCompleteWorkflow.php',
     'ArcanistSingleLintEngine' => 'lint/engine/ArcanistSingleLintEngine.php',
-    'ArcanistSpellingDefaultData' => 'lint/linter/ArcanistSpellingDefaultData.php',
+    'ArcanistSpellingDefaultData' => 'lint/linter/spelling/ArcanistSpellingDefaultData.php',
     'ArcanistSpellingLinter' => 'lint/linter/ArcanistSpellingLinter.php',
     'ArcanistSpellingLinterTestCase' => 'lint/linter/__tests__/ArcanistSpellingLinterTestCase.php',
     'ArcanistSubversionAPI' => 'repository/api/ArcanistSubversionAPI.php',
diff --git a/src/lint/linter/ArcanistSpellingLinter.php b/src/lint/linter/ArcanistSpellingLinter.php
index 5abd8933..7d043238 100644
--- a/src/lint/linter/ArcanistSpellingLinter.php
+++ b/src/lint/linter/ArcanistSpellingLinter.php
@@ -115,7 +115,7 @@ final class ArcanistSpellingLinter extends ArcanistLinter {
         $next,
         $severity,
         sprintf(
-          "Possible spelling error.  You wrote '%s', but did you mean '%s'",
+          "Possible spelling error. You wrote '%s', but did you mean '%s'?",
           $word,
           $correct_word
         )
@@ -141,7 +141,7 @@ final class ArcanistSpellingLinter extends ArcanistLinter {
         $match[1],
         $severity,
         sprintf(
-          "Possible spelling error.  You wrote '%s', but did you mean '%s'",
+          "Possible spelling error. You wrote '%s', but did you mean '%s'?",
           $word,
           $correct_word
         )
diff --git a/src/lint/linter/ArcanistSpellingDefaultData.php b/src/lint/linter/spelling/ArcanistSpellingDefaultData.php
similarity index 100%
rename from src/lint/linter/ArcanistSpellingDefaultData.php
rename to src/lint/linter/spelling/ArcanistSpellingDefaultData.php