diff --git a/src/applications/audit/mail/PhabricatorAuditMailReceiver.php b/src/applications/audit/mail/PhabricatorAuditMailReceiver.php
index 29b1748264..36e68c76a9 100644
--- a/src/applications/audit/mail/PhabricatorAuditMailReceiver.php
+++ b/src/applications/audit/mail/PhabricatorAuditMailReceiver.php
@@ -1,28 +1,28 @@
 <?php
 
 final class PhabricatorAuditMailReceiver extends PhabricatorObjectMailReceiver {
 
   public function isEnabled() {
     return PhabricatorApplication::isClassInstalled(
       'PhabricatorAuditApplication');
   }
 
   protected function getObjectPattern() {
-    return 'C[1-9]\d*';
+    return 'COMMIT[1-9]\d*';
   }
 
   protected function loadObject($pattern, PhabricatorUser $viewer) {
-    $id = (int)trim($pattern, 'C');
+    $id = (int)preg_replace('/^COMMIT/', '', $pattern);
 
     return id(new DiffusionCommitQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->needAuditRequests(true)
       ->executeOne();
   }
 
   protected function getTransactionReplyHandler() {
     return new PhabricatorAuditReplyHandler();
   }
 
 }
diff --git a/src/applications/audit/mail/PhabricatorAuditReplyHandler.php b/src/applications/audit/mail/PhabricatorAuditReplyHandler.php
index c1eb562bfa..3b619fdd7f 100644
--- a/src/applications/audit/mail/PhabricatorAuditReplyHandler.php
+++ b/src/applications/audit/mail/PhabricatorAuditReplyHandler.php
@@ -1,21 +1,19 @@
 <?php
 
 final class PhabricatorAuditReplyHandler
   extends PhabricatorApplicationTransactionReplyHandler {
 
   public function validateMailReceiver($mail_receiver) {
     if (!($mail_receiver instanceof PhabricatorRepositoryCommit)) {
       throw new Exception(
         pht(
           'Mail receiver is not a %s!',
           'PhabricatorRepositoryCommit'));
     }
   }
 
   public function getObjectPrefix() {
-    // TODO: This conflicts with Countdown and will probably need to be
-    // changed eventually.
-    return 'C';
+    return 'COMMIT';
   }
 
 }