diff --git a/src/layouts/component-test/component-test.vue b/src/layouts/component-test/component-test.vue
index c0a33561a..fbc9f0133 100644
--- a/src/layouts/component-test/component-test.vue
+++ b/src/layouts/component-test/component-test.vue
@@ -22,7 +22,8 @@
     </div>
     <div class="row">
       <div class="col my-3 d-flex align-items-center">
-        <buttonPrimary
+        <buttonMain
+        isPrimary
         buttonText="Primary"
         loaderColor="white"
         sizeInRem="1" />
@@ -887,7 +888,7 @@
 </template>
 
 <script>
-import buttonPrimary from "@/ux-components/button-primary/button-primary";
+import buttonMain from "@/ux-components/button-main/button-main";
 import buttonSecondary from "@/ux-components/button-secondary/button-secondary";
 import buttonBack from "@/common-components/button-back/button-back";
 import listCard from "@/ux-components/list-card/list-card";
@@ -902,7 +903,7 @@ import textLink from "@/ux-components/text-link/text-link";
 export default {
   name: "App",
   components: {
-    buttonPrimary,
+    buttonMain,
     buttonSecondary,
     buttonBack,
     listCard,
diff --git a/src/ux-components/button/button.spec.js b/src/ux-components/button-main/button-main.spec.js
similarity index 100%
rename from src/ux-components/button/button.spec.js
rename to src/ux-components/button-main/button-main.spec.js
diff --git a/src/ux-components/button/button.vue b/src/ux-components/button-main/button-main.vue
similarity index 84%
rename from src/ux-components/button/button.vue
rename to src/ux-components/button-main/button-main.vue
index 15e2bb98f..5d89e9afa 100644
--- a/src/ux-components/button/button.vue
+++ b/src/ux-components/button-main/button-main.vue
@@ -1,14 +1,14 @@
 <template>
-  <button :disabled="isDisabled" :aria-disabled="isDisabled" class="btn d-flex align-items-center py-3 px-4" :class="isPrimary ? 'btn-primary' : 'btn-secondary'" @click="displayComponent">
+  <button :disabled="isDisabled" :aria-disabled="isDisabled" class="btn d-flex align-items-center py-3 px-4" :class="isPrimary ? 'btn-primary' : 'btn-secondary'" @click="clicked()">
     <span class="m-0">{{ this.buttonText }}</span>
-    <loader class="ms-2" v-if="display" v-bind:style="{ width: `${sizeInRem}rem`, height: `${sizeInRem}rem` }" v-bind:class="[this.loaderColor, this.loaderPosition]" />
+    <loader class="ms-2" v-if="isLoaderDisplayed" v-bind:style="{ width: `${sizeInRem}rem`, height: `${sizeInRem}rem` }" v-bind:class="[this.loaderColor, this.loaderPosition]" />
   </button>
 </template>
 
 <script>
 import loader from "@/ux-components/loader/loader";
 export default {
-  name: "buttonPrimary",
+  name: "buttonMain",
   props: {
     isPrimary: Boolean,
     buttonText: String,
@@ -19,13 +19,14 @@ export default {
   },
   data() {
     return {
-      display: false,
+      isLoaderDisplayed: false,
     };
   },
   methods: {
-    displayComponent() {
-      this.display = true;
-    },
+    clicked() {
+      this.isLoaderDisplayed = true;
+      this.$emit('click-event');
+    }
   },
   components: {
     loader,