diff --git a/components/Main.vue b/components/Main.vue
index e09ae68..f9cb190 100644
--- a/components/Main.vue
+++ b/components/Main.vue
@@ -105,8 +105,8 @@ import HerosWithSideImage from "./ui/Heros/WithSideImage";
 import HerosWithBGImage from "./ui/Heros/WithBGImage";
 import HerosWithPattern from "./ui/Heros/WithPattern";
 // Sidebars
-import SidebarsWithSearch from "./ui/Sidebars/WithSearch";
-import SidebarsWithAvatar from "./ui/Sidebars/WithAvatar";
+import SidebarWithSearch from "./ui/Sidebar/WithSearch";
+import SidebarWithAvatar from "./ui/Sidebar/WithAvatar";
 // Sections
 import SectionsAboutMe from "./ui/Sections/AboutMe";
 import SectionsFeature from "./ui/Sections/Feature";
@@ -115,7 +115,7 @@ import SectionsParagraphWithImage from "./ui/Sections/ParagraphWithImage";
 // Pricing
 import PricingSimple from "./ui//Pricing/Simple";
 // paginations
-import PaginationsSimple from "./ui/Paginations/Simple";
+import PaginationSimple from "./ui/Pagination/Simple";
 // Footers
 import FootersSimple from "./ui/Footers/Simple";
 import FootersWithDetails from "./ui/Footers/WithDetails";
@@ -167,14 +167,14 @@ export default {
         HerosWithSideImage,
         HerosWithBGImage,
         HerosWithPattern,
-        SidebarsWithAvatar,
-        SidebarsWithSearch,
+        SidebarWithAvatar,
+        SidebarWithSearch,
         SectionsAboutMe,
         SectionsFeature,
         SectionsOurTeam,
         SectionsParagraphWithImage,
         PricingSimple,
-        PaginationsSimple,
+        PaginationSimple,
         FootersSimple,
         FootersWithDetails,
         FootersWithLinks,
diff --git a/components/ui/Paginations/Simple.vue b/components/ui/Pagination/Simple.vue
similarity index 100%
rename from components/ui/Paginations/Simple.vue
rename to components/ui/Pagination/Simple.vue
diff --git a/components/ui/Sidebars/WithAvatar.vue b/components/ui/Sidebar/WithAvatar.vue
similarity index 100%
rename from components/ui/Sidebars/WithAvatar.vue
rename to components/ui/Sidebar/WithAvatar.vue
diff --git a/components/ui/Sidebars/WithSearch.vue b/components/ui/Sidebar/WithSearch.vue
similarity index 100%
rename from components/ui/Sidebars/WithSearch.vue
rename to components/ui/Sidebar/WithSearch.vue
diff --git a/models/Components.js b/models/Components.js
index 9780f08..19363a1 100644
--- a/models/Components.js
+++ b/models/Components.js
@@ -77,7 +77,7 @@ export default [
         ],
     },
     {
-        name: "Sidebars",
+        name: "Sidebar",
         components: [{ name: "WithSearch" }, { name: "WithAvatar" }],
     },
     {
@@ -94,7 +94,7 @@ export default [
         components: [{ name: "Simple" }],
     },
     {
-        name: "Paginations",
+        name: "Pagination",
         components: [{ name: "Simple" }],
     },
     {