diff --git a/src/discovery/events/send/SendDiscovery.ts b/src/discovery/events/send/SendDiscovery.ts
index 5fe0da3fe2..665afcc002 100644
--- a/src/discovery/events/send/SendDiscovery.ts
+++ b/src/discovery/events/send/SendDiscovery.ts
@@ -1,6 +1,6 @@
 import {
-  BehavioralEventsTrackingApi,
   createConfiguration,
+  CustomEventDataApi,
   RequestContext,
   ResponseContext,
   ServerConfiguration,
@@ -11,7 +11,7 @@ import IConfiguration from '../../../configuration/IConfiguration'
 import ApiDecoratorService from '../../../services/ApiDecoratorService'
 
 export default class EventsDiscovery {
-  public behavioralEventsTrackingApi: BehavioralEventsTrackingApi
+  public customEventDataApi: CustomEventDataApi
 
   constructor(config: IConfiguration) {
     const configuration = createConfiguration(
@@ -24,8 +24,8 @@ export default class EventsDiscovery {
       >(config, ServerConfiguration, Observable, Observable),
     )
 
-    this.behavioralEventsTrackingApi = ApiDecoratorService.getInstance().apply<BehavioralEventsTrackingApi>(
-      new BehavioralEventsTrackingApi(configuration),
+    this.customEventDataApi = ApiDecoratorService.getInstance().apply<CustomEventDataApi>(
+      new CustomEventDataApi(configuration),
     )
   }
 }
diff --git a/test/spec/events/events.spec.ts b/test/spec/events/events.spec.ts
index 4abb518fa7..a458978d59 100644
--- a/test/spec/events/events.spec.ts
+++ b/test/spec/events/events.spec.ts
@@ -1,3 +1,4 @@
+import { EventsApi } from '../../../codegen/events/index'
 import { Client } from '../../../index'
 import SendDiscovery from '../../../src/discovery/events/send/SendDiscovery'
 
@@ -5,6 +6,7 @@ describe('api client', () => {
   it('is discoverable', () => {
     const client = new Client().events
     expect(client.hasOwnProperty('eventsApi')).toBeTruthy()
+    expect(EventsApi.name).toBe(client.eventsApi.constructor.name)
     expect(SendDiscovery.name).toBe(client.send.constructor.name)
   })
 })
diff --git a/test/spec/events/send/send.spec.ts b/test/spec/events/send/send.spec.ts
index 8a7d7bba0d..70ec98d210 100644
--- a/test/spec/events/send/send.spec.ts
+++ b/test/spec/events/send/send.spec.ts
@@ -1,10 +1,10 @@
-import { BehavioralEventsTrackingApi } from '../../../../codegen/events/send/index'
+import { CustomEventDataApi } from '../../../../codegen/events/send/index'
 import { Client } from '../../../../index'
 
 describe('api client', () => {
   it('is discoverable', () => {
     const client = new Client().events.send
-    expect(client.hasOwnProperty('behavioralEventsTrackingApi')).toBeTruthy()
-    expect(BehavioralEventsTrackingApi.name).toBe(client.behavioralEventsTrackingApi.constructor.name)
+    expect(client.hasOwnProperty('customEventDataApi')).toBeTruthy()
+    expect(CustomEventDataApi.name).toBe(client.customEventDataApi.constructor.name)
   })
 })