diff --git a/frontend/src/container/OnboardingQuestionaire/Footer/index.ts b/frontend/src/container/OnboardingQuestionaire/Footer/index.ts
deleted file mode 100644
index 9abca301b5..0000000000
--- a/frontend/src/container/OnboardingQuestionaire/Footer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { OnboardingFooter } from './Footer';
diff --git a/frontend/src/container/OnboardingQuestionaire/Header/index.ts b/frontend/src/container/OnboardingQuestionaire/Header/index.ts
deleted file mode 100644
index 63688f9c45..0000000000
--- a/frontend/src/container/OnboardingQuestionaire/Header/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { OnboardingHeader } from './Header';
diff --git a/frontend/src/container/OnboardingQuestionaire/Footer/Footer.styles.scss b/frontend/src/container/OnboardingQuestionaire/OnboardingFooter/OnboardingFooter.styles.scss
similarity index 100%
rename from frontend/src/container/OnboardingQuestionaire/Footer/Footer.styles.scss
rename to frontend/src/container/OnboardingQuestionaire/OnboardingFooter/OnboardingFooter.styles.scss
diff --git a/frontend/src/container/OnboardingQuestionaire/Footer/Footer.tsx b/frontend/src/container/OnboardingQuestionaire/OnboardingFooter/OnboardingFooter.tsx
similarity index 97%
rename from frontend/src/container/OnboardingQuestionaire/Footer/Footer.tsx
rename to frontend/src/container/OnboardingQuestionaire/OnboardingFooter/OnboardingFooter.tsx
index 1d999ff033..25482e2436 100644
--- a/frontend/src/container/OnboardingQuestionaire/Footer/Footer.tsx
+++ b/frontend/src/container/OnboardingQuestionaire/OnboardingFooter/OnboardingFooter.tsx
@@ -1,4 +1,4 @@
-import './Footer.styles.scss';
+import './OnboardingFooter.styles.scss';
 
 import { ArrowUpRight, Dot } from 'lucide-react';
 
diff --git a/frontend/src/container/OnboardingQuestionaire/OnboardingFooter/index.ts b/frontend/src/container/OnboardingQuestionaire/OnboardingFooter/index.ts
new file mode 100644
index 0000000000..cc029cb359
--- /dev/null
+++ b/frontend/src/container/OnboardingQuestionaire/OnboardingFooter/index.ts
@@ -0,0 +1 @@
+export { OnboardingFooter } from './OnboardingFooter';
diff --git a/frontend/src/container/OnboardingQuestionaire/Header/Header.styles.scss b/frontend/src/container/OnboardingQuestionaire/OnboardingHeader/OnboardingHeader.styles.scss
similarity index 100%
rename from frontend/src/container/OnboardingQuestionaire/Header/Header.styles.scss
rename to frontend/src/container/OnboardingQuestionaire/OnboardingHeader/OnboardingHeader.styles.scss
diff --git a/frontend/src/container/OnboardingQuestionaire/Header/Header.tsx b/frontend/src/container/OnboardingQuestionaire/OnboardingHeader/OnboardingHeader.tsx
similarity index 92%
rename from frontend/src/container/OnboardingQuestionaire/Header/Header.tsx
rename to frontend/src/container/OnboardingQuestionaire/OnboardingHeader/OnboardingHeader.tsx
index ef92a77289..76801d7620 100644
--- a/frontend/src/container/OnboardingQuestionaire/Header/Header.tsx
+++ b/frontend/src/container/OnboardingQuestionaire/OnboardingHeader/OnboardingHeader.tsx
@@ -1,4 +1,4 @@
-import './Header.styles.scss';
+import './OnboardingHeader.styles.scss';
 
 import { Color } from '@signozhq/design-tokens';
 import { LifeBuoy } from 'lucide-react';
diff --git a/frontend/src/container/OnboardingQuestionaire/OnboardingHeader/index.ts b/frontend/src/container/OnboardingQuestionaire/OnboardingHeader/index.ts
new file mode 100644
index 0000000000..644a6d9b84
--- /dev/null
+++ b/frontend/src/container/OnboardingQuestionaire/OnboardingHeader/index.ts
@@ -0,0 +1 @@
+export { OnboardingHeader } from './OnboardingHeader';
diff --git a/frontend/src/container/OnboardingQuestionaire/index.tsx b/frontend/src/container/OnboardingQuestionaire/index.tsx
index 35e021076b..719da996fc 100644
--- a/frontend/src/container/OnboardingQuestionaire/index.tsx
+++ b/frontend/src/container/OnboardingQuestionaire/index.tsx
@@ -3,9 +3,9 @@ import './OnboardingQuestionaire.styles.scss';
 import { useState } from 'react';
 
 import { AboutSigNozQuestions } from './AboutSigNozQuestions/AboutSigNozQuestions';
-import { OnboardingFooter } from './Footer/Footer';
-import { OnboardingHeader } from './Header/Header';
 import InviteTeamMembers from './InviteTeamMembers/InviteTeamMembers';
+import { OnboardingFooter } from './OnboardingFooter/OnboardingFooter';
+import { OnboardingHeader } from './OnboardingHeader/OnboardingHeader';
 import OptimiseSignozNeeds from './OptimiseSignozNeeds/OptimiseSignozNeeds';
 import OrgQuestions from './OrgQuestions/OrgQuestions';