diff --git a/apps/web/components/eventtype/EventLimitsTab.tsx b/apps/web/components/eventtype/EventLimitsTab.tsx
index 02c5b04596..1c1d35b421 100644
--- a/apps/web/components/eventtype/EventLimitsTab.tsx
+++ b/apps/web/components/eventtype/EventLimitsTab.tsx
@@ -146,9 +146,9 @@ export const EventLimitsTab = () => {
       <div className="border-subtle space-y-6 rounded-lg border p-6">
         <div className="flex flex-col space-y-4 lg:flex-row lg:space-x-4 lg:space-y-0">
           <div className="w-full">
-            <Label htmlFor="beforeBufferTime">{t("before_event")}</Label>
+            <Label htmlFor="beforeEventBuffer">{t("before_event")}</Label>
             <Controller
-              name="beforeBufferTime"
+              name="beforeEventBuffer"
               render={({ field: { onChange, value } }) => {
                 const beforeBufferOptions = [
                   {
@@ -176,9 +176,9 @@ export const EventLimitsTab = () => {
             />
           </div>
           <div className="w-full">
-            <Label htmlFor="afterBufferTime">{t("after_event")}</Label>
+            <Label htmlFor="afterEventBuffer">{t("after_event")}</Label>
             <Controller
-              name="afterBufferTime"
+              name="afterEventBuffer"
               render={({ field: { onChange, value } }) => {
                 const afterBufferOptions = [
                   {
diff --git a/apps/web/modules/event-types/views/event-types-single-view.tsx b/apps/web/modules/event-types/views/event-types-single-view.tsx
index 77d7d6eb3b..787e937a51 100644
--- a/apps/web/modules/event-types/views/event-types-single-view.tsx
+++ b/apps/web/modules/event-types/views/event-types-single-view.tsx
@@ -126,8 +126,8 @@ export type FormValues = {
   scheduleName: string;
   minimumBookingNotice: number;
   minimumBookingNoticeInDurationType: number;
-  beforeBufferTime: number;
-  afterBufferTime: number;
+  beforeEventBuffer: number;
+  afterEventBuffer: number;
   slotInterval: number | null;
   metadata: z.infer<typeof EventTypeMetaDataSchema>;
   destinationCalendar: {
@@ -455,8 +455,8 @@ const EventTypePage = (props: EventTypeSetupProps) => {
     const {
       periodDates,
       periodCountCalendarDays,
-      beforeBufferTime,
-      afterBufferTime,
+      beforeEventBuffer,
+      afterEventBuffer,
       seatsPerTimeSlot,
       seatsShowAttendees,
       seatsShowAvailabilityCount,
@@ -527,8 +527,8 @@ const EventTypePage = (props: EventTypeSetupProps) => {
       periodEndDate: periodDates.endDate,
       periodCountCalendarDays: periodCountCalendarDays === "1",
       id: eventType.id,
-      beforeEventBuffer: beforeBufferTime,
-      afterEventBuffer: afterBufferTime,
+      beforeEventBuffer,
+      afterEventBuffer,
       bookingLimits,
       onlyShowFirstAvailableSlot,
       durationLimits,
@@ -595,8 +595,8 @@ const EventTypePage = (props: EventTypeSetupProps) => {
             const {
               periodDates,
               periodCountCalendarDays,
-              beforeBufferTime,
-              afterBufferTime,
+              beforeEventBuffer,
+              afterEventBuffer,
               seatsPerTimeSlot,
               seatsShowAttendees,
               seatsShowAvailabilityCount,
@@ -657,8 +657,8 @@ const EventTypePage = (props: EventTypeSetupProps) => {
               periodEndDate: periodDates.endDate,
               periodCountCalendarDays: periodCountCalendarDays === "1",
               id: eventType.id,
-              beforeEventBuffer: beforeBufferTime,
-              afterEventBuffer: afterBufferTime,
+              beforeEventBuffer,
+              afterEventBuffer,
               bookingLimits,
               onlyShowFirstAvailableSlot,
               durationLimits,