Index: grails-app/services/com/lemans/ds/solr/SolrQueryService.groovy
===================================================================
diff -u -rf9a47eacbacba622dfb2b5de0648bcdfa998c8cf -r4de017e5153c785456a1392c7744bea5a8e9cc6c
--- grails-app/services/com/lemans/ds/solr/SolrQueryService.groovy	(.../SolrQueryService.groovy)	(revision f9a47eacbacba622dfb2b5de0648bcdfa998c8cf)
+++ grails-app/services/com/lemans/ds/solr/SolrQueryService.groovy	(.../SolrQueryService.groovy)	(revision 4de017e5153c785456a1392c7744bea5a8e9cc6c)
@@ -127,8 +127,8 @@
                 queueCountsForPartsWithComCodesNotAssociatedToCategory(payload, pool),
                 queueCountsForQcPartPendingApproval(payload, pool),
                 queueCountsForQcPartRejected(payload, pool),
-                queueCountsForQcPendingFutureParts(payload, pool),
-                queueCountsForQcPendingLiveParts(payload, pool)
+                queueCountsForQCProductPendingApproval(payload, pool),
+                queueCountsForQCProductRejected(payload, pool)
         ]
         List queueCounts = futures.stream().map { CompletableFuture future -> future.join() }.collect(Collectors.toList())
         injectPastWeekCounts(queueCounts)
@@ -214,28 +214,26 @@
         }, executor)
     }
 
-    private CompletableFuture queueCountsForQcPendingFutureParts(QueuePayload payload, Executor executor) {
+    private CompletableFuture queueCountsForQCProductPendingApproval(QueuePayload payload, Executor executor) {
         CompletableFuture.supplyAsync(new Supplier<Map>() {
             @Override
             Map get() {
-                QueuePayload queuePayload = copyWithQueueType(payload, QueueType.QC_PENDING_FUTURE_PARTS)
+                QueuePayload queuePayload = copyWithQueueType(payload, QueueType.QC_PRODUCT_PENDING_APPROVAL)
                 SolrQuery query = new SolrQuery()
-                        .addFilterQuery('(qcStatusCode:13001)')
-                        .addFilterQuery('(derivedPartStatusId:9006)')
+                        .addFilterQuery('(qcProductStatusCode:13001)')
                 QueryResponse queryResponse = dsQueueSolrClient.query(buildFacetQuery(query, queuePayload))
                 buildResponse(queryResponse, queuePayload)
             }
         }, executor)
     }
 
-    private CompletableFuture queueCountsForQcPendingLiveParts(QueuePayload payload, Executor executor) {
+    private CompletableFuture queueCountsForQCProductRejected(QueuePayload payload, Executor executor) {
         CompletableFuture.supplyAsync(new Supplier<Map>() {
             @Override
             Map get() {
-                QueuePayload queuePayload = copyWithQueueType(payload, QueueType.QC_PENDING_LIVE_PARTS)
+                QueuePayload queuePayload = copyWithQueueType(payload, QueueType.QC_PRODUCT_REJECTED)
                 SolrQuery query = new SolrQuery()
-                        .addFilterQuery('(qcStatusCode:13001)')
-                        .addFilterQuery('(-derivedPartStatusId:9006)')
+                        .addFilterQuery('(qcProductStatusCode:13003)')
                 QueryResponse queryResponse = dsQueueSolrClient.query(buildFacetQuery(query, queuePayload))
                 buildResponse(queryResponse, queuePayload)
             }