diff --git a/api/api.gen.go b/api/api.gen.go
index ad97c309a..1dbce6988 100644
--- a/api/api.gen.go
+++ b/api/api.gen.go
@@ -10729,88 +10729,88 @@ var swaggerSpec = []string{
 	"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",
-	"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",
+	"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",
 	"BgA=",
 }
 
diff --git a/api/openapi.yaml b/api/openapi.yaml
index a12142bb5..c24a682b0 100644
--- a/api/openapi.yaml
+++ b/api/openapi.yaml
@@ -4060,7 +4060,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Event'
+                $ref: '#/components/schemas/NotificationEvent'
         '400':
           description: The server cannot or will not process the request due to something that is perceived to be a client error (e.g., malformed request syntax, invalid request message framing, or deceptive request routing).
           content:
@@ -4481,7 +4481,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Event'
+                $ref: '#/components/schemas/NotificationEvent'
         '400':
           description: The server cannot or will not process the request due to something that is perceived to be a client error (e.g., malformed request syntax, invalid request message framing, or deceptive request routing).
           content:
diff --git a/api/spec/src/cloud/subjects.tsp b/api/spec/src/cloud/subjects.tsp
index c5623a516..a2ad56356 100644
--- a/api/spec/src/cloud/subjects.tsp
+++ b/api/spec/src/cloud/subjects.tsp
@@ -59,30 +59,4 @@ interface Subjects {
   currentPeriodEnd: DateTime.fromISO("2023-02-01T00:00:00Z"),
   stripeCustomerId: "cus_JMOlctsKV8",
 })
-model SubjectUpsert {
-  /**
-   * A unique, human-readable identifier for the subject.
-   */
-  @example("customer-id")
-  key: string;
-
-  /**
-   * A human-readable display name for the subject.
-   */
-  @example("Customer Name")
-  displayName?: string;
-
-  // TODO: figure out if we want to support arbitrary values or string only
-
-  @example(#{ hubspotId: "123456" })
-  metadata?: Record<unknown> | null;
-
-  @example(DateTime.fromISO("2023-01-01T00:00:00Z"))
-  currentPeriodStart?: DateTime;
-
-  @example(DateTime.fromISO("2023-02-01T00:00:00Z"))
-  currentPeriodEnd?: DateTime;
-
-  @example("cus_JMOlctsKV8")
-  stripeCustomerId?: string | null;
-}
+model SubjectUpsert is Rest.Resource.ResourceCreateModel<OpenMeter.Subject>;
diff --git a/api/spec/src/notification/event.tsp b/api/spec/src/notification/event.tsp
index c165d142c..0594b3d72 100644
--- a/api/spec/src/notification/event.tsp
+++ b/api/spec/src/notification/event.tsp
@@ -283,5 +283,5 @@ interface Events {
   @summary("Get notification event")
   get(
     @path eventId: string,
-  ): Event | OpenMeter.NotFoundError | OpenMeter.CommonErrors;
+  ): NotificationEvent | OpenMeter.NotFoundError | OpenMeter.CommonErrors;
 }
diff --git a/api/spec/src/notification/rule.tsp b/api/spec/src/notification/rule.tsp
index 89c45cf92..9f508dd5e 100644
--- a/api/spec/src/notification/rule.tsp
+++ b/api/spec/src/notification/rule.tsp
@@ -308,6 +308,6 @@ interface Rules {
   @operationId("testNotificationRule")
   test(@path ruleId: ULID): {
     @statusCode _: 201;
-    @body body: Event;
+    @body body: NotificationEvent;
   } | OpenMeter.NotFoundError | OpenMeter.CommonErrors;
 }