diff --git a/apps/web/components/apps/CalendarListContainer.tsx b/apps/web/components/apps/CalendarListContainer.tsx
index 2c070447b6..953d63f9ee 100644
--- a/apps/web/components/apps/CalendarListContainer.tsx
+++ b/apps/web/components/apps/CalendarListContainer.tsx
@@ -2,7 +2,7 @@ import { Fragment, useEffect } from "react";
 
 import { InstallAppButton } from "@calcom/app-store/components";
 import {
-  SelectedCalendarSettingsWebWrapper,
+  SelectedCalendarsSettingsWebWrapper,
   DestinationCalendarSettingsWebWrapper,
 } from "@calcom/atoms/monorepo";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -107,7 +107,7 @@ export function CalendarListContainer(props: { heading?: boolean; fromOnboarding
                 {heading && (
                   <>
                     <DestinationCalendarSettingsWebWrapper />
-                    <SelectedCalendarSettingsWebWrapper
+                    <SelectedCalendarsSettingsWebWrapper
                       onChanged={onChanged}
                       fromOnboarding={fromOnboarding}
                       destinationCalendarId={data.destinationCalendar?.externalId}
diff --git a/packages/platform/atoms/calendar-settings/wrappers/CalendarSettingsPlatformWrapper.tsx b/packages/platform/atoms/calendar-settings/wrappers/CalendarSettingsPlatformWrapper.tsx
index 41219bd86d..47d9712cf8 100644
--- a/packages/platform/atoms/calendar-settings/wrappers/CalendarSettingsPlatformWrapper.tsx
+++ b/packages/platform/atoms/calendar-settings/wrappers/CalendarSettingsPlatformWrapper.tsx
@@ -1,5 +1,5 @@
 import { DestinationCalendarSettingsPlatformWrapper } from "../../destination-calendar/index";
-import { SelectedCalendarSettingsPlatformWrapper } from "../../selected-calendar/index";
+import { SelectedCalendarsSettingsPlatformWrapper } from "../../selected-calendars/index";
 
 type CalendarSettingsPlatformWrapperProps = {
   classNames?: {
@@ -16,7 +16,7 @@ export const CalendarSettingsPlatformWrapper = ({ classNames }: CalendarSettings
         statusLoader={<></>}
         classNames={classNames?.destinationCalendarSettingsCustomClassnames}
       />
-      <SelectedCalendarSettingsPlatformWrapper
+      <SelectedCalendarsSettingsPlatformWrapper
         classNames={classNames?.selectedCalendarSettingsCustomClassnames}
       />
     </div>
diff --git a/packages/platform/atoms/index.ts b/packages/platform/atoms/index.ts
index 395c1ef5fe..ceb98aa9e0 100644
--- a/packages/platform/atoms/index.ts
+++ b/packages/platform/atoms/index.ts
@@ -20,6 +20,6 @@ export { useDeleteCalendarCredentials } from "./hooks/calendars/useDeleteCalenda
 export { useAddSelectedCalendar } from "./hooks/calendars/useAddSelectedCalendar";
 export { useRemoveSelectedCalendar } from "./hooks/calendars/useRemoveSelectedCalendar";
 export { useTeams } from "./hooks/teams/useTeams";
-export { SelectedCalendarSettingsPlatformWrapper as SelectedCalendarSettings } from "./selected-calendar/index";
+export { SelectedCalendarsSettingsPlatformWrapper as SelectedCalendarsSettings } from "./selected-calendars/index";
 export { DestinationCalendarSettingsPlatformWrapper as DestinationCalendarSettings } from "./destination-calendar/index";
 export { CalendarSettingsPlatformWrapper as CalendarSettings } from "./calendar-settings/index";
diff --git a/packages/platform/atoms/monorepo.ts b/packages/platform/atoms/monorepo.ts
index 9fc847c78a..37b0130a6b 100644
--- a/packages/platform/atoms/monorepo.ts
+++ b/packages/platform/atoms/monorepo.ts
@@ -7,5 +7,5 @@ export { useEventTypeById } from "./hooks/event-types/private/useEventTypeById";
 export { useHandleBookEvent } from "./hooks/useHandleBookEvent";
 export * as Dialog from "./src/components/ui/dialog";
 export { Timezone } from "./timezone";
-export { SelectedCalendarSettingsWebWrapper } from "./selected-calendar/wrappers/SelectedCalendarSettingsWebWrapper";
+export { SelectedCalendarsSettingsWebWrapper } from "./selected-calendars/wrappers/SelectedCalendarsSettingsWebWrapper";
 export { DestinationCalendarSettingsWebWrapper } from "./destination-calendar/wrappers/DestinationCalendarSettingsWebWrapper";
diff --git a/packages/platform/atoms/selected-calendar/index.ts b/packages/platform/atoms/selected-calendar/index.ts
deleted file mode 100644
index b5e78e6425..0000000000
--- a/packages/platform/atoms/selected-calendar/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { SelectedCalendarSettingsPlatformWrapper } from "./wrappers/SelectedCalendarSettingsPlatformWrapper";
diff --git a/packages/platform/atoms/selected-calendar/SelectedCalendarSettings.tsx b/packages/platform/atoms/selected-calendars/SelectedCalendarsSettings.tsx
similarity index 66%
rename from packages/platform/atoms/selected-calendar/SelectedCalendarSettings.tsx
rename to packages/platform/atoms/selected-calendars/SelectedCalendarsSettings.tsx
index 0aa1f5dade..b3a949856c 100644
--- a/packages/platform/atoms/selected-calendar/SelectedCalendarSettings.tsx
+++ b/packages/platform/atoms/selected-calendars/SelectedCalendarsSettings.tsx
@@ -2,6 +2,6 @@ import type { ReactNode } from "react";
 
 import { cn } from "../src/lib/utils";
 
-export const SelectedCalendarSettings = (props: { children: ReactNode; classNames?: string }) => {
+export const SelectedCalendarsSettings = (props: { children: ReactNode; classNames?: string }) => {
   return <div className={cn("border-subtle mt-6 rounded-lg border", props.classNames)}>{props.children}</div>;
 };
diff --git a/packages/platform/atoms/selected-calendars/index.ts b/packages/platform/atoms/selected-calendars/index.ts
new file mode 100644
index 0000000000..141d3b9a0d
--- /dev/null
+++ b/packages/platform/atoms/selected-calendars/index.ts
@@ -0,0 +1 @@
+export { SelectedCalendarsSettingsPlatformWrapper } from "./wrappers/SelectedCalendarsSettingsPlatformWrapper";
diff --git a/packages/platform/atoms/selected-calendar/wrappers/SelectedCalendarSettingsPlatformWrapper.tsx b/packages/platform/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsPlatformWrapper.tsx
similarity index 96%
rename from packages/platform/atoms/selected-calendar/wrappers/SelectedCalendarSettingsPlatformWrapper.tsx
rename to packages/platform/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsPlatformWrapper.tsx
index 6e28d35a9f..61764b26f6 100644
--- a/packages/platform/atoms/selected-calendar/wrappers/SelectedCalendarSettingsPlatformWrapper.tsx
+++ b/packages/platform/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsPlatformWrapper.tsx
@@ -20,9 +20,9 @@ import { useConnectedCalendars } from "../../hooks/useConnectedCalendars";
 import { AtomsWrapper } from "../../src/components/atoms-wrapper";
 import { Switch } from "../../src/components/ui/switch";
 import { useToast } from "../../src/components/ui/use-toast";
-import { SelectedCalendarSettings } from "../SelectedCalendarSettings";
+import { SelectedCalendarsSettings } from "../SelectedCalendarsSettings";
 
-export const SelectedCalendarSettingsPlatformWrapper = ({
+export const SelectedCalendarsSettingsPlatformWrapper = ({
   classNames = "mx-5 mb-6",
 }: {
   classNames?: string;
@@ -43,8 +43,8 @@ export const SelectedCalendarSettingsPlatformWrapper = ({
             }
 
             return (
-              <SelectedCalendarSettings classNames={classNames}>
-                <SelectedCalendarSettingsHeading />
+              <SelectedCalendarsSettings classNames={classNames}>
+                <SelectedCalendarsSettingsHeading />
                 <List noBorderTreatment className="p-6 pt-2">
                   {data.connectedCalendars.map((connectedCalendar) => {
                     if (!!connectedCalendar.calendars && connectedCalendar.calendars.length > 0) {
@@ -112,7 +112,7 @@ export const SelectedCalendarSettingsPlatformWrapper = ({
                     );
                   })}
                 </List>
-              </SelectedCalendarSettings>
+              </SelectedCalendarsSettings>
             );
           }}
         />
@@ -121,7 +121,7 @@ export const SelectedCalendarSettingsPlatformWrapper = ({
   );
 };
 
-const SelectedCalendarSettingsHeading = () => {
+const SelectedCalendarsSettingsHeading = () => {
   const { t } = useLocale();
 
   return (
diff --git a/packages/platform/atoms/selected-calendar/wrappers/SelectedCalendarSettingsWebWrapper.tsx b/packages/platform/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsWebWrapper.tsx
similarity index 93%
rename from packages/platform/atoms/selected-calendar/wrappers/SelectedCalendarSettingsWebWrapper.tsx
rename to packages/platform/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsWebWrapper.tsx
index 8620f66cd7..ffe36056df 100644
--- a/packages/platform/atoms/selected-calendar/wrappers/SelectedCalendarSettingsWebWrapper.tsx
+++ b/packages/platform/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsWebWrapper.tsx
@@ -11,9 +11,9 @@ import { List } from "@calcom/ui";
 import AppListCard from "@calcom/web/components/AppListCard";
 import AdditionalCalendarSelector from "@calcom/web/components/apps/AdditionalCalendarSelector";
 
-import { SelectedCalendarSettings } from "../SelectedCalendarSettings";
+import { SelectedCalendarsSettings } from "../SelectedCalendarsSettings";
 
-type SelectedCalendarSettingsWebWrapperProps = {
+type SelectedCalendarsSettingsWebWrapperProps = {
   onChanged: () => unknown | Promise<unknown>;
   fromOnboarding?: boolean;
   destinationCalendarId?: string;
@@ -21,7 +21,7 @@ type SelectedCalendarSettingsWebWrapperProps = {
   classNames?: string;
 };
 
-export const SelectedCalendarSettingsWebWrapper = (props: SelectedCalendarSettingsWebWrapperProps) => {
+export const SelectedCalendarsSettingsWebWrapper = (props: SelectedCalendarsSettingsWebWrapperProps) => {
   const { t } = useLocale();
   const query = trpc.viewer.connectedCalendars.useQuery(undefined, {
     suspense: true,
@@ -39,8 +39,8 @@ export const SelectedCalendarSettingsWebWrapper = (props: SelectedCalendarSettin
           }
 
           return (
-            <SelectedCalendarSettings classNames={props.classNames}>
-              <SelectedCalendarSettingsHeading
+            <SelectedCalendarsSettings classNames={props.classNames}>
+              <SelectedCalendarsSettingsHeading
                 isConnectedCalendarsPresent={!!data.connectedCalendars.length}
                 isPending={isPending}
               />
@@ -122,7 +122,7 @@ export const SelectedCalendarSettingsWebWrapper = (props: SelectedCalendarSettin
                   );
                 })}
               </List>
-            </SelectedCalendarSettings>
+            </SelectedCalendarsSettings>
           );
         }}
       />
@@ -130,7 +130,7 @@ export const SelectedCalendarSettingsWebWrapper = (props: SelectedCalendarSettin
   );
 };
 
-const SelectedCalendarSettingsHeading = (props: {
+const SelectedCalendarsSettingsHeading = (props: {
   isConnectedCalendarsPresent: boolean;
   isPending?: boolean;
 }) => {