diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 85a998f971..1c7e4160e9 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1989,8 +1989,8 @@ phutil_register_library_map(array(
     'PhabricatorObjectListQueryTestCase' => 'applications/phid/query/__tests__/PhabricatorObjectListQueryTestCase.php',
     'PhabricatorObjectMailReceiver' => 'applications/metamta/receiver/PhabricatorObjectMailReceiver.php',
     'PhabricatorObjectMailReceiverTestCase' => 'applications/metamta/receiver/__tests__/PhabricatorObjectMailReceiverTestCase.php',
-    'PhabricatorObjectMentionedByObject' => 'applications/transactions/edges/PhabricatorObjectMentionedByObject.php',
-    'PhabricatorObjectMentionsObject' => 'applications/transactions/edges/PhabricatorObjectMentionsObject.php',
+    'PhabricatorObjectMentionedByObjectEdgeType' => 'applications/transactions/edges/PhabricatorObjectMentionedByObjectEdgeType.php',
+    'PhabricatorObjectMentionsObjectEdgeType' => 'applications/transactions/edges/PhabricatorObjectMentionsObjectEdgeType.php',
     'PhabricatorObjectQuery' => 'applications/phid/query/PhabricatorObjectQuery.php',
     'PhabricatorObjectRemarkupRule' => 'infrastructure/markup/rule/PhabricatorObjectRemarkupRule.php',
     'PhabricatorObjectSelectorDialog' => 'view/control/PhabricatorObjectSelectorDialog.php',
@@ -5162,8 +5162,8 @@ phutil_register_library_map(array(
     'PhabricatorObjectListQueryTestCase' => 'PhabricatorTestCase',
     'PhabricatorObjectMailReceiver' => 'PhabricatorMailReceiver',
     'PhabricatorObjectMailReceiverTestCase' => 'PhabricatorTestCase',
-    'PhabricatorObjectMentionedByObject' => 'PhabricatorEdgeType',
-    'PhabricatorObjectMentionsObject' => 'PhabricatorEdgeType',
+    'PhabricatorObjectMentionedByObjectEdgeType' => 'PhabricatorEdgeType',
+    'PhabricatorObjectMentionsObjectEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorObjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorObjectRemarkupRule' => 'PhutilRemarkupRule',
     'PhabricatorOffsetPagedQuery' => 'PhabricatorQuery',
diff --git a/src/applications/transactions/edges/PhabricatorObjectMentionedByObject.php b/src/applications/transactions/edges/PhabricatorObjectMentionedByObjectEdgeType.php
similarity index 69%
rename from src/applications/transactions/edges/PhabricatorObjectMentionedByObject.php
rename to src/applications/transactions/edges/PhabricatorObjectMentionedByObjectEdgeType.php
index 89f1e24410..f7095cd504 100644
--- a/src/applications/transactions/edges/PhabricatorObjectMentionedByObject.php
+++ b/src/applications/transactions/edges/PhabricatorObjectMentionedByObjectEdgeType.php
@@ -1,11 +1,12 @@
 <?php
 
-final class PhabricatorObjectMentionedByObject extends PhabricatorEdgeType {
+final class PhabricatorObjectMentionedByObjectEdgeType
+  extends PhabricatorEdgeType {
 
   const EDGECONST = 51;
 
   public function getInverseEdgeConstant() {
-    return PhabricatorObjectMentionsObject::EDGECONST;
+    return PhabricatorObjectMentionsObjectEdgeType::EDGECONST;
   }
 
   public function shouldWriteInverseTransactions() {
diff --git a/src/applications/transactions/edges/PhabricatorObjectMentionsObject.php b/src/applications/transactions/edges/PhabricatorObjectMentionsObjectEdgeType.php
similarity index 51%
rename from src/applications/transactions/edges/PhabricatorObjectMentionsObject.php
rename to src/applications/transactions/edges/PhabricatorObjectMentionsObjectEdgeType.php
index 3c61554400..20d5a78b70 100644
--- a/src/applications/transactions/edges/PhabricatorObjectMentionsObject.php
+++ b/src/applications/transactions/edges/PhabricatorObjectMentionsObjectEdgeType.php
@@ -1,11 +1,12 @@
 <?php
 
-final class PhabricatorObjectMentionsObject extends PhabricatorEdgeType {
+final class PhabricatorObjectMentionsObjectEdgeType
+  extends PhabricatorEdgeType {
 
   const EDGECONST = 52;
 
   public function getInverseEdgeConstant() {
-    return PhabricatorObjectMentionedByObject::EDGECONST;
+    return PhabricatorObjectMentionedByObjectEdgeType::EDGECONST;
   }
 
   public function shouldWriteInverseTransactions() {
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 420b48b720..af0fa02a76 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -1249,7 +1249,7 @@ abstract class PhabricatorApplicationTransactionEditor
       }
     }
     if ($mentionable_phids) {
-      $edge_type = PhabricatorObjectMentionsObject::EDGECONST;
+      $edge_type = PhabricatorObjectMentionsObjectEdgeType::EDGECONST;
       $block_xactions[] = newv(get_class(head($xactions)), array())
         ->setIgnoreOnNoEffect(true)
         ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index 016b01f1a9..698ccd9988 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -452,10 +452,10 @@ abstract class PhabricatorApplicationTransaction
       case PhabricatorTransactions::TYPE_EDGE:
         $edge_type = $this->getMetadataValue('edge:type');
         switch ($edge_type) {
-          case PhabricatorObjectMentionsObject::EDGECONST:
+          case PhabricatorObjectMentionsObjectEdgeType::EDGECONST:
             return true;
             break;
-          case PhabricatorObjectMentionedByObject::EDGECONST:
+          case PhabricatorObjectMentionedByObjectEdgeType::EDGECONST:
             $new = ipull($this->getNewValue(), 'dst');
             $old = ipull($this->getOldValue(), 'dst');
             $add = array_diff($new, $old);
@@ -491,8 +491,8 @@ abstract class PhabricatorApplicationTransaction
      case PhabricatorTransactions::TYPE_EDGE:
         $edge_type = $this->getMetadataValue('edge:type');
         switch ($edge_type) {
-          case PhabricatorObjectMentionsObject::EDGECONST:
-          case PhabricatorObjectMentionedByObject::EDGECONST:
+          case PhabricatorObjectMentionsObjectEdgeType::EDGECONST:
+          case PhabricatorObjectMentionedByObjectEdgeType::EDGECONST:
             return true;
             break;
           default:
@@ -521,8 +521,8 @@ abstract class PhabricatorApplicationTransaction
      case PhabricatorTransactions::TYPE_EDGE:
         $edge_type = $this->getMetadataValue('edge:type');
         switch ($edge_type) {
-          case PhabricatorObjectMentionsObject::EDGECONST:
-          case PhabricatorObjectMentionedByObject::EDGECONST:
+          case PhabricatorObjectMentionsObjectEdgeType::EDGECONST:
+          case PhabricatorObjectMentionedByObjectEdgeType::EDGECONST:
             return true;
             break;
           default: