diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2540,12 +2540,12 @@
     'ReleephProductEditor' => 'applications/releeph/editor/ReleephProductEditor.php',
     'ReleephProductHistoryController' => 'applications/releeph/controller/project/ReleephProductHistoryController.php',
     'ReleephProductListController' => 'applications/releeph/controller/project/ReleephProductListController.php',
+    'ReleephProductQuery' => 'applications/releeph/query/ReleephProductQuery.php',
     'ReleephProductSearchEngine' => 'applications/releeph/query/ReleephProductSearchEngine.php',
     'ReleephProductTransaction' => 'applications/releeph/storage/ReleephProductTransaction.php',
     'ReleephProductTransactionQuery' => 'applications/releeph/query/ReleephProductTransactionQuery.php',
     'ReleephProductViewController' => 'applications/releeph/controller/project/ReleephProductViewController.php',
     'ReleephProject' => 'applications/releeph/storage/ReleephProject.php',
-    'ReleephProjectQuery' => 'applications/releeph/query/ReleephProjectQuery.php',
     'ReleephReasonFieldSpecification' => 'applications/releeph/field/specification/ReleephReasonFieldSpecification.php',
     'ReleephRequest' => 'applications/releeph/storage/ReleephRequest.php',
     'ReleephRequestActionController' => 'applications/releeph/controller/request/ReleephRequestActionController.php',
@@ -5540,6 +5540,7 @@
       0 => 'ReleephController',
       1 => 'PhabricatorApplicationSearchResultsControllerInterface',
     ),
+    'ReleephProductQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'ReleephProductSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'ReleephProductTransaction' => 'PhabricatorApplicationTransaction',
     'ReleephProductTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
@@ -5553,7 +5554,6 @@
       0 => 'ReleephDAO',
       1 => 'PhabricatorPolicyInterface',
     ),
-    'ReleephProjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'ReleephReasonFieldSpecification' => 'ReleephFieldSpecification',
     'ReleephRequest' =>
     array(
diff --git a/src/applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php b/src/applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php
--- a/src/applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php
+++ b/src/applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php
@@ -24,7 +24,7 @@
   protected function execute(ConduitAPIRequest $request) {
     $results = array();
 
-    $projects = id(new ReleephProjectQuery())
+    $projects = id(new ReleephProductQuery())
       ->setViewer($request->getUser())
       ->withActive(1)
       ->execute();
diff --git a/src/applications/releeph/controller/branch/ReleephBranchCreateController.php b/src/applications/releeph/controller/branch/ReleephBranchCreateController.php
--- a/src/applications/releeph/controller/branch/ReleephBranchCreateController.php
+++ b/src/applications/releeph/controller/branch/ReleephBranchCreateController.php
@@ -12,7 +12,7 @@
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
-    $product = id(new ReleephProjectQuery())
+    $product = id(new ReleephProductQuery())
       ->setViewer($viewer)
       ->withIDs(array($this->productID))
       ->requireCapabilities(
diff --git a/src/applications/releeph/controller/project/ReleephProductActionController.php b/src/applications/releeph/controller/project/ReleephProductActionController.php
--- a/src/applications/releeph/controller/project/ReleephProductActionController.php
+++ b/src/applications/releeph/controller/project/ReleephProductActionController.php
@@ -14,7 +14,7 @@
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
-    $product = id(new ReleephProjectQuery())
+    $product = id(new ReleephProductQuery())
       ->withIDs(array($this->id))
       ->requireCapabilities(
         array(
diff --git a/src/applications/releeph/controller/project/ReleephProductEditController.php b/src/applications/releeph/controller/project/ReleephProductEditController.php
--- a/src/applications/releeph/controller/project/ReleephProductEditController.php
+++ b/src/applications/releeph/controller/project/ReleephProductEditController.php
@@ -12,7 +12,7 @@
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
-    $product = id(new ReleephProjectQuery())
+    $product = id(new ReleephProductQuery())
       ->setViewer($viewer)
       ->withIDs(array($this->productID))
       ->needArcanistProjects(true)
diff --git a/src/applications/releeph/controller/project/ReleephProductHistoryController.php b/src/applications/releeph/controller/project/ReleephProductHistoryController.php
--- a/src/applications/releeph/controller/project/ReleephProductHistoryController.php
+++ b/src/applications/releeph/controller/project/ReleephProductHistoryController.php
@@ -16,7 +16,7 @@
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
-    $product = id(new ReleephProjectQuery())
+    $product = id(new ReleephProductQuery())
       ->setViewer($viewer)
       ->withIDs(array($this->id))
       ->executeOne();
diff --git a/src/applications/releeph/controller/project/ReleephProductViewController.php b/src/applications/releeph/controller/project/ReleephProductViewController.php
--- a/src/applications/releeph/controller/project/ReleephProductViewController.php
+++ b/src/applications/releeph/controller/project/ReleephProductViewController.php
@@ -19,7 +19,7 @@
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
-    $product = id(new ReleephProjectQuery())
+    $product = id(new ReleephProductQuery())
       ->setViewer($viewer)
       ->withIDs(array($this->productID))
       ->executeOne();
diff --git a/src/applications/releeph/phid/ReleephPHIDTypeProduct.php b/src/applications/releeph/phid/ReleephPHIDTypeProduct.php
--- a/src/applications/releeph/phid/ReleephPHIDTypeProduct.php
+++ b/src/applications/releeph/phid/ReleephPHIDTypeProduct.php
@@ -20,7 +20,7 @@
     PhabricatorObjectQuery $query,
     array $phids) {
 
-    return id(new ReleephProjectQuery())
+    return id(new ReleephProductQuery())
       ->withPHIDs($phids);
   }
 
diff --git a/src/applications/releeph/query/ReleephBranchQuery.php b/src/applications/releeph/query/ReleephBranchQuery.php
--- a/src/applications/releeph/query/ReleephBranchQuery.php
+++ b/src/applications/releeph/query/ReleephBranchQuery.php
@@ -56,7 +56,7 @@
   public function willFilterPage(array $branches) {
     $project_ids = mpull($branches, 'getReleephProjectID');
 
-    $projects = id(new ReleephProjectQuery())
+    $projects = id(new ReleephProductQuery())
       ->withIDs($project_ids)
       ->setViewer($this->getViewer())
       ->execute();
diff --git a/src/applications/releeph/query/ReleephProjectQuery.php b/src/applications/releeph/query/ReleephProductQuery.php
rename from src/applications/releeph/query/ReleephProjectQuery.php
rename to src/applications/releeph/query/ReleephProductQuery.php
--- a/src/applications/releeph/query/ReleephProjectQuery.php
+++ b/src/applications/releeph/query/ReleephProductQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-final class ReleephProjectQuery
+final class ReleephProductQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $active;
diff --git a/src/applications/releeph/query/ReleephProductSearchEngine.php b/src/applications/releeph/query/ReleephProductSearchEngine.php
--- a/src/applications/releeph/query/ReleephProductSearchEngine.php
+++ b/src/applications/releeph/query/ReleephProductSearchEngine.php
@@ -12,8 +12,8 @@
   }
 
   public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
-    $query = id(new ReleephProjectQuery())
-      ->setOrder(ReleephProjectQuery::ORDER_NAME)
+    $query = id(new ReleephProductQuery())
+      ->setOrder(ReleephProductQuery::ORDER_NAME)
       ->needArcanistProjects(true);
 
     $active = $saved->getParameter('active');