diff --git a/.changeset/spicy-rings-dress.md b/.changeset/spicy-rings-dress.md
new file mode 100644
index 0000000..0bdf6c0
--- /dev/null
+++ b/.changeset/spicy-rings-dress.md
@@ -0,0 +1,5 @@
+---
+'x-boilerplate': major
+---
+
+Change names in component structure
diff --git a/app/(i18next)/i18next/page.tsx b/app/(i18next)/i18next/page.tsx
index 8c489b6..2d3b12a 100644
--- a/app/(i18next)/i18next/page.tsx
+++ b/app/(i18next)/i18next/page.tsx
@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next';
 import { AVAILABLE_LANGUAGES } from '@/libs/i18n/constants';
 import i18n from '@/libs/i18n/init';
 
-import Header from '@/components/Header';
+import Header from '@/components/header';
 
 function I18nextPage() {
   const router = useRouter();
diff --git a/app/(marketing)/resend/page.tsx b/app/(marketing)/resend/page.tsx
index fdc43e0..e8bdabd 100644
--- a/app/(marketing)/resend/page.tsx
+++ b/app/(marketing)/resend/page.tsx
@@ -12,7 +12,7 @@ import * as z from 'zod';
 
 import { sendEmailSchema } from '@/utils/validations/send-email';
 
-import Header from '@/components/Header';
+import Header from '@/components/header';
 import { useResendEmail } from '@/hooks/services/resend/email/use-resend-email.hook';
 
 type FormValues = z.infer<typeof sendEmailSchema>;
diff --git a/app/layout.tsx b/app/layout.tsx
index 98c3e41..19db4c8 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -3,8 +3,8 @@ import * as React from 'react';
 
 import Providers from './Providers';
 
-import Container from '@/components/Container';
-import SocialContainer from '@/components/SocialContainer';
+import Container from '@/components/container';
+import SocialContainer from '@/components/social-container';
 
 type MainLayoutProps = {
   children?: React.ReactNode;
diff --git a/app/next-auth/page.tsx b/app/next-auth/page.tsx
index 5b644e4..b9e7db1 100644
--- a/app/next-auth/page.tsx
+++ b/app/next-auth/page.tsx
@@ -6,7 +6,7 @@ import { authOptions } from '@/libs/auth';
 import SignInProviderButton from './SignInProviderButton';
 import SignOutButton from './SignOutButton';
 
-import Header from '@/components/Header';
+import Header from '@/components/header';
 import SessionStatus from '@/components/session-status';
 
 async function NextAuthPage() {
diff --git a/app/page.tsx b/app/page.tsx
index 29ab5b8..a6b21cf 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -3,9 +3,9 @@ import * as React from 'react';
 
 import Typography from '@design-system/Typography';
 
-import FeatureCard from '@/components/FeatureCard';
+import FeatureCard from '@/components/feature-card';
 import SessionStatus from '@/components/session-status';
-import XBoilerplate from '@/components/XBoilerplate';
+import XBoilerplate from '@/components/x-boilerplate';
 
 async function HomePage() {
   return (
diff --git a/app/react-hook-form/hello/[name]/page.tsx b/app/react-hook-form/hello/[name]/page.tsx
index 5059a0a..dd8d80f 100644
--- a/app/react-hook-form/hello/[name]/page.tsx
+++ b/app/react-hook-form/hello/[name]/page.tsx
@@ -3,7 +3,7 @@
 import { useRouter } from 'next/navigation';
 import * as React from 'react';
 
-import Header from '@/components/Header';
+import Header from '@/components/header';
 
 type HelloNamePageProps = {
   params: {
@@ -29,6 +29,6 @@ function HelloNamePage({ params }: HelloNamePageProps) {
       onGoBack={handleGoBack}
     />
   );
-};
+}
 
 export default HelloNamePage;
diff --git a/app/react-hook-form/page.tsx b/app/react-hook-form/page.tsx
index 4839465..6295abb 100644
--- a/app/react-hook-form/page.tsx
+++ b/app/react-hook-form/page.tsx
@@ -5,8 +5,8 @@ import * as React from 'react';
 
 import { NextPageLayout } from '@/utils/types';
 
-import Header from '@/components/Header';
-import HelloForm from '@/components/HelloForm';
+import Header from '@/components/header';
+import HelloForm from '@/components/hello-form';
 
 const XstatePage: NextPageLayout = () => {
   const router = useRouter();
diff --git a/app/x-state/page.tsx b/app/x-state/page.tsx
index e9ca10c..8358efb 100644
--- a/app/x-state/page.tsx
+++ b/app/x-state/page.tsx
@@ -11,7 +11,7 @@ import { selectorGetDog, selectorGetDogLoading } from '@/machines/dog/dog.select
 
 import { NextPageLayout } from '@/utils/types';
 
-import Header from '@/components/Header';
+import Header from '@/components/header';
 
 const XstatePage: NextPageLayout = () => {
   const router = useRouter();
diff --git a/components/FeatureCard/FeatureCard.module.css b/components/feature-card/FeatureCard.module.css
similarity index 100%
rename from components/FeatureCard/FeatureCard.module.css
rename to components/feature-card/FeatureCard.module.css
diff --git a/components/FeatureCard/FeatureCard.tsx b/components/feature-card/FeatureCard.tsx
similarity index 100%
rename from components/FeatureCard/FeatureCard.tsx
rename to components/feature-card/FeatureCard.tsx
diff --git a/components/FeatureCard/index.ts b/components/feature-card/index.ts
similarity index 100%
rename from components/FeatureCard/index.ts
rename to components/feature-card/index.ts
diff --git a/components/HelloForm/HelloForm.tsx b/components/hello-form/HelloForm.tsx
similarity index 100%
rename from components/HelloForm/HelloForm.tsx
rename to components/hello-form/HelloForm.tsx
diff --git a/components/HelloForm/HelloForm.type.ts b/components/hello-form/HelloForm.type.ts
similarity index 100%
rename from components/HelloForm/HelloForm.type.ts
rename to components/hello-form/HelloForm.type.ts
diff --git a/components/HelloForm/index.ts b/components/hello-form/index.ts
similarity index 100%
rename from components/HelloForm/index.ts
rename to components/hello-form/index.ts
diff --git a/components/SocialContainer/SocialContainer.module.css b/components/social-container/SocialContainer.module.css
similarity index 100%
rename from components/SocialContainer/SocialContainer.module.css
rename to components/social-container/SocialContainer.module.css
diff --git a/components/SocialContainer/SocialContainer.tsx b/components/social-container/SocialContainer.tsx
similarity index 89%
rename from components/SocialContainer/SocialContainer.tsx
rename to components/social-container/SocialContainer.tsx
index 3b3dbb7..23441db 100644
--- a/components/SocialContainer/SocialContainer.tsx
+++ b/components/social-container/SocialContainer.tsx
@@ -4,7 +4,7 @@ import { SiGithub } from '@icons-pack/react-simple-icons';
 
 import styles from './SocialContainer.module.css';
 
-import { XBoilerplateSimple } from '@/components/XBoilerplate';
+import { XBoilerplateSimple } from '@/components/x-boilerplate';
 
 function SocialContainer() {
   return (
diff --git a/components/SocialContainer/index.ts b/components/social-container/index.ts
similarity index 100%
rename from components/SocialContainer/index.ts
rename to components/social-container/index.ts
diff --git a/components/XBoilerplate/XBoilerplate.tsx b/components/x-boilerplate/XBoilerplate.tsx
similarity index 100%
rename from components/XBoilerplate/XBoilerplate.tsx
rename to components/x-boilerplate/XBoilerplate.tsx
diff --git a/components/XBoilerplate/XBoilerplate.types.ts b/components/x-boilerplate/XBoilerplate.types.ts
similarity index 100%
rename from components/XBoilerplate/XBoilerplate.types.ts
rename to components/x-boilerplate/XBoilerplate.types.ts
diff --git a/components/XBoilerplate/XBoilerplateSimple.tsx b/components/x-boilerplate/XBoilerplateSimple.tsx
similarity index 100%
rename from components/XBoilerplate/XBoilerplateSimple.tsx
rename to components/x-boilerplate/XBoilerplateSimple.tsx
diff --git a/components/XBoilerplate/index.ts b/components/x-boilerplate/index.ts
similarity index 100%
rename from components/XBoilerplate/index.ts
rename to components/x-boilerplate/index.ts