diff --git a/packages/auth/src/Domain/Event/DomainEventFactory.spec.ts b/packages/auth/src/Domain/Event/DomainEventFactory.spec.ts
index 8b1facdd5..c56aedceb 100644
--- a/packages/auth/src/Domain/Event/DomainEventFactory.spec.ts
+++ b/packages/auth/src/Domain/Event/DomainEventFactory.spec.ts
@@ -1,7 +1,7 @@
 import 'reflect-metadata'
 
 import { EmailMessageIdentifier, RoleName } from '@standardnotes/common'
-import { PredicateName, PredicateAuthority, PredicateVerificationResult } from '@standardnotes/scheduler'
+import { PredicateName, PredicateAuthority, PredicateVerificationResult } from '@standardnotes/predicates'
 import { TimerInterface } from '@standardnotes/time'
 
 import { DomainEventFactory } from './DomainEventFactory'
diff --git a/packages/auth/src/Domain/Event/DomainEventFactory.ts b/packages/auth/src/Domain/Event/DomainEventFactory.ts
index 183e7ddf1..6f734259e 100644
--- a/packages/auth/src/Domain/Event/DomainEventFactory.ts
+++ b/packages/auth/src/Domain/Event/DomainEventFactory.ts
@@ -16,7 +16,7 @@ import {
   DomainEventService,
   EmailMessageRequestedEvent,
 } from '@standardnotes/domain-events'
-import { Predicate, PredicateVerificationResult } from '@standardnotes/scheduler'
+import { Predicate, PredicateVerificationResult } from '@standardnotes/predicates'
 import { TimerInterface } from '@standardnotes/time'
 import { inject, injectable } from 'inversify'
 import TYPES from '../../Bootstrap/Types'
diff --git a/packages/auth/src/Domain/Event/DomainEventFactoryInterface.ts b/packages/auth/src/Domain/Event/DomainEventFactoryInterface.ts
index b9f14da7c..91ba99a99 100644
--- a/packages/auth/src/Domain/Event/DomainEventFactoryInterface.ts
+++ b/packages/auth/src/Domain/Event/DomainEventFactoryInterface.ts
@@ -1,5 +1,5 @@
 import { Uuid, RoleName, EmailMessageIdentifier } from '@standardnotes/common'
-import { Predicate, PredicateVerificationResult } from '@standardnotes/scheduler'
+import { Predicate, PredicateVerificationResult } from '@standardnotes/predicates'
 import {
   AccountDeletionRequestedEvent,
   CloudBackupRequestedEvent,
diff --git a/packages/auth/src/Domain/Handler/PredicateVerificationRequestedEventHandler.spec.ts b/packages/auth/src/Domain/Handler/PredicateVerificationRequestedEventHandler.spec.ts
index 946756aba..23434dfd4 100644
--- a/packages/auth/src/Domain/Handler/PredicateVerificationRequestedEventHandler.spec.ts
+++ b/packages/auth/src/Domain/Handler/PredicateVerificationRequestedEventHandler.spec.ts
@@ -7,7 +7,7 @@ import {
   PredicateVerificationRequestedEventPayload,
   PredicateVerifiedEvent,
 } from '@standardnotes/domain-events'
-import { Predicate, PredicateVerificationResult } from '@standardnotes/scheduler'
+import { Predicate, PredicateVerificationResult } from '@standardnotes/predicates'
 import { Logger } from 'winston'
 
 import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
diff --git a/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.spec.ts b/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.spec.ts
index 99485378d..21b9f66c4 100644
--- a/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.spec.ts
+++ b/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.spec.ts
@@ -1,6 +1,6 @@
 import 'reflect-metadata'
 
-import { PredicateName, PredicateVerificationResult, PredicateAuthority } from '@standardnotes/scheduler'
+import { PredicateName, PredicateVerificationResult, PredicateAuthority } from '@standardnotes/predicates'
 
 import { Setting } from '../../Setting/Setting'
 import { SettingRepositoryInterface } from '../../Setting/SettingRepositoryInterface'
diff --git a/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.ts b/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.ts
index 50528f8ae..ebb5a10cb 100644
--- a/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.ts
+++ b/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicate.ts
@@ -1,5 +1,5 @@
 import { Uuid } from '@standardnotes/common'
-import { PredicateName, PredicateVerificationResult } from '@standardnotes/scheduler'
+import { PredicateName, PredicateVerificationResult } from '@standardnotes/predicates'
 import { EmailBackupFrequency, SettingName } from '@standardnotes/settings'
 import { inject, injectable } from 'inversify'
 
diff --git a/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicateDTO.ts b/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicateDTO.ts
index 2c44ddce6..a10799fe1 100644
--- a/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicateDTO.ts
+++ b/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicateDTO.ts
@@ -1,5 +1,5 @@
 import { Uuid } from '@standardnotes/common'
-import { Predicate } from '@standardnotes/scheduler'
+import { Predicate } from '@standardnotes/predicates'
 
 export type VerifyPredicateDTO = {
   predicate: Predicate
diff --git a/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicateResponse.ts b/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicateResponse.ts
index 73bb460b3..e6ff01372 100644
--- a/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicateResponse.ts
+++ b/packages/auth/src/Domain/UseCase/VerifyPredicate/VerifyPredicateResponse.ts
@@ -1,4 +1,4 @@
-import { PredicateVerificationResult } from '@standardnotes/scheduler'
+import { PredicateVerificationResult } from '@standardnotes/predicates'
 
 export type VerifyPredicateResponse = {
   predicateVerificationResult: PredicateVerificationResult
diff --git a/packages/domain-events/src/Domain/Event/PredicateVerificationRequestedEventPayload.ts b/packages/domain-events/src/Domain/Event/PredicateVerificationRequestedEventPayload.ts
index 51e9a967c..be0232733 100644
--- a/packages/domain-events/src/Domain/Event/PredicateVerificationRequestedEventPayload.ts
+++ b/packages/domain-events/src/Domain/Event/PredicateVerificationRequestedEventPayload.ts
@@ -1,4 +1,4 @@
-import { Predicate } from '@standardnotes/scheduler'
+import { Predicate } from '@standardnotes/predicates'
 
 export interface PredicateVerificationRequestedEventPayload {
   predicate: Predicate
diff --git a/packages/domain-events/src/Domain/Event/PredicateVerifiedEventPayload.ts b/packages/domain-events/src/Domain/Event/PredicateVerifiedEventPayload.ts
index 6864d1b0b..e684a757a 100644
--- a/packages/domain-events/src/Domain/Event/PredicateVerifiedEventPayload.ts
+++ b/packages/domain-events/src/Domain/Event/PredicateVerifiedEventPayload.ts
@@ -1,4 +1,4 @@
-import { Predicate, PredicateVerificationResult } from '@standardnotes/scheduler'
+import { Predicate, PredicateVerificationResult } from '@standardnotes/predicates'
 
 export interface PredicateVerifiedEventPayload {
   predicate: Predicate
diff --git a/packages/scheduler/src/Domain/Event/DomainEventFactory.spec.ts b/packages/scheduler/src/Domain/Event/DomainEventFactory.spec.ts
index 5bcbb1055..57aece5b4 100644
--- a/packages/scheduler/src/Domain/Event/DomainEventFactory.spec.ts
+++ b/packages/scheduler/src/Domain/Event/DomainEventFactory.spec.ts
@@ -4,7 +4,7 @@ import { EmailMessageIdentifier } from '@standardnotes/common'
 import { TimerInterface } from '@standardnotes/time'
 
 import { DomainEventFactory } from './DomainEventFactory'
-import { PredicateAuthority, PredicateName } from '@standardnotes/scheduler'
+import { PredicateAuthority, PredicateName } from '@standardnotes/predicates'
 import { Job } from '../Job/Job'
 import { Predicate } from '../Predicate/Predicate'
 
diff --git a/packages/scheduler/src/Domain/Event/DomainEventFactory.ts b/packages/scheduler/src/Domain/Event/DomainEventFactory.ts
index f1a937931..e4ee7fc34 100644
--- a/packages/scheduler/src/Domain/Event/DomainEventFactory.ts
+++ b/packages/scheduler/src/Domain/Event/DomainEventFactory.ts
@@ -4,7 +4,7 @@ import {
   EmailMessageRequestedEvent,
   PredicateVerificationRequestedEvent,
 } from '@standardnotes/domain-events'
-import { PredicateAuthority } from '@standardnotes/scheduler'
+import { PredicateAuthority } from '@standardnotes/predicates'
 import { TimerInterface } from '@standardnotes/time'
 import { inject, injectable } from 'inversify'
 import TYPES from '../../Bootstrap/Types'
diff --git a/packages/scheduler/src/Domain/Handler/PredicateVerifiedEventHandler.spec.ts b/packages/scheduler/src/Domain/Handler/PredicateVerifiedEventHandler.spec.ts
index bf276c1b6..c7e16b528 100644
--- a/packages/scheduler/src/Domain/Handler/PredicateVerifiedEventHandler.spec.ts
+++ b/packages/scheduler/src/Domain/Handler/PredicateVerifiedEventHandler.spec.ts
@@ -1,5 +1,5 @@
 import { PredicateVerifiedEvent } from '@standardnotes/domain-events'
-import { PredicateAuthority, PredicateName, PredicateVerificationResult } from '@standardnotes/scheduler'
+import { PredicateAuthority, PredicateName, PredicateVerificationResult } from '@standardnotes/predicates'
 import 'reflect-metadata'
 import { Logger } from 'winston'
 import { UpdatePredicateStatus } from '../UseCase/UpdatePredicateStatus/UpdatePredicateStatus'
diff --git a/packages/scheduler/src/Domain/Handler/UserRegisteredEventHandler.ts b/packages/scheduler/src/Domain/Handler/UserRegisteredEventHandler.ts
index e3c60768a..0c3d3236f 100644
--- a/packages/scheduler/src/Domain/Handler/UserRegisteredEventHandler.ts
+++ b/packages/scheduler/src/Domain/Handler/UserRegisteredEventHandler.ts
@@ -1,5 +1,5 @@
 import { DomainEventHandlerInterface, UserRegisteredEvent } from '@standardnotes/domain-events'
-import { PredicateAuthority, PredicateName } from '@standardnotes/scheduler'
+import { PredicateAuthority, PredicateName } from '@standardnotes/predicates'
 import { TimerInterface } from '@standardnotes/time'
 import { inject, injectable } from 'inversify'
 
diff --git a/packages/scheduler/src/Domain/Job/JobDoneInterpreter.spec.ts b/packages/scheduler/src/Domain/Job/JobDoneInterpreter.spec.ts
index a4664d7dd..40dafbb87 100644
--- a/packages/scheduler/src/Domain/Job/JobDoneInterpreter.spec.ts
+++ b/packages/scheduler/src/Domain/Job/JobDoneInterpreter.spec.ts
@@ -1,5 +1,5 @@
 import { DomainEventPublisherInterface, EmailMessageRequestedEvent } from '@standardnotes/domain-events'
-import { PredicateName } from '@standardnotes/scheduler'
+import { PredicateName } from '@standardnotes/predicates'
 import 'reflect-metadata'
 import { DomainEventFactoryInterface } from '../Event/DomainEventFactoryInterface'
 import { Predicate } from '../Predicate/Predicate'
diff --git a/packages/scheduler/src/Domain/Job/JobDoneInterpreter.ts b/packages/scheduler/src/Domain/Job/JobDoneInterpreter.ts
index 7098093a3..7badb88a4 100644
--- a/packages/scheduler/src/Domain/Job/JobDoneInterpreter.ts
+++ b/packages/scheduler/src/Domain/Job/JobDoneInterpreter.ts
@@ -1,6 +1,6 @@
 import { EmailMessageIdentifier } from '@standardnotes/common'
 import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
-import { PredicateName } from '@standardnotes/scheduler'
+import { PredicateName } from '@standardnotes/predicates'
 import { inject, injectable } from 'inversify'
 
 import TYPES from '../../Bootstrap/Types'
diff --git a/packages/scheduler/src/Domain/Predicate/Predicate.ts b/packages/scheduler/src/Domain/Predicate/Predicate.ts
index 7e2afdb56..d63f6d75d 100644
--- a/packages/scheduler/src/Domain/Predicate/Predicate.ts
+++ b/packages/scheduler/src/Domain/Predicate/Predicate.ts
@@ -1,5 +1,5 @@
 /* istanbul ignore file */
-import { PredicateAuthority, PredicateName } from '@standardnotes/scheduler'
+import { PredicateAuthority, PredicateName } from '@standardnotes/predicates'
 import { Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
 
 import { Job } from '../Job/Job'
diff --git a/packages/scheduler/src/Domain/UseCase/UpdatePredicateStatus/UpdatePredicateStatus.spec.ts b/packages/scheduler/src/Domain/UseCase/UpdatePredicateStatus/UpdatePredicateStatus.spec.ts
index 14d8c827e..8a3da0b9b 100644
--- a/packages/scheduler/src/Domain/UseCase/UpdatePredicateStatus/UpdatePredicateStatus.spec.ts
+++ b/packages/scheduler/src/Domain/UseCase/UpdatePredicateStatus/UpdatePredicateStatus.spec.ts
@@ -1,4 +1,4 @@
-import { PredicateAuthority, PredicateName, PredicateVerificationResult } from '@standardnotes/scheduler'
+import { PredicateAuthority, PredicateName, PredicateVerificationResult } from '@standardnotes/predicates'
 import 'reflect-metadata'
 
 import { JobDoneInterpreterInterface } from '../../Job/JobDoneInterpreterInterface'
diff --git a/packages/scheduler/src/Domain/UseCase/UpdatePredicateStatus/UpdatePredicateStatusDTO.ts b/packages/scheduler/src/Domain/UseCase/UpdatePredicateStatus/UpdatePredicateStatusDTO.ts
index 82db61299..c4f4252ea 100644
--- a/packages/scheduler/src/Domain/UseCase/UpdatePredicateStatus/UpdatePredicateStatusDTO.ts
+++ b/packages/scheduler/src/Domain/UseCase/UpdatePredicateStatus/UpdatePredicateStatusDTO.ts
@@ -1,4 +1,4 @@
-import { Predicate, PredicateVerificationResult } from '@standardnotes/scheduler'
+import { Predicate, PredicateVerificationResult } from '@standardnotes/predicates'
 
 export type UpdatePredicateStatusDTO = {
   predicate: Predicate