diff --git a/api/apps/api/src/modules/cost-surface/infra/project/project-cost-surface-events.handler.ts b/api/apps/api/src/modules/cost-surface/infra/project/project-cost-surface-events.handler.ts
index 0cb2864283..5f5a1c7886 100644
--- a/api/apps/api/src/modules/cost-surface/infra/project/project-cost-surface-events.handler.ts
+++ b/api/apps/api/src/modules/cost-surface/infra/project/project-cost-surface-events.handler.ts
@@ -26,11 +26,11 @@ export class ProjectCostSurfaceEventsHandler
   // TODO!!! Create proper events
 
   private failEventsMapper: EventKind = {
-    event: API_EVENT_KINDS.scenario__costSurface__costUpdateFailed__v1_alpha1,
+    event: API_EVENT_KINDS.project__costSurface_shapefile_failed__v1alpha1,
   };
 
   private successEventsMapper: EventKind = {
-    event: API_EVENT_KINDS.scenario__costSurface__finished__v1_alpha1,
+    event: API_EVENT_KINDS.project__costSurface_shapefile_finished__v1alpha1,
   };
 
   constructor(