diff --git a/src/components/entity/EntityList.vue b/src/components/entity/EntityList.vue
index 2072f060..d85d23fc 100644
--- a/src/components/entity/EntityList.vue
+++ b/src/components/entity/EntityList.vue
@@ -172,7 +172,7 @@
                   <div class="row">
                     <div
                       class="text-left form-group"
-                      :class="baseUrl === 'collection' ? 'col-6' : 'col-12'"
+                      :class="baseUrl === 'unit' ? 'col-6' : 'col-12'"
                     >
                       <label>
                         <span class="text-capitalize">{{ baseUrl }}</span> Name:
@@ -211,7 +211,7 @@
                     </div>
                     <div
                       class="col-6 text-left form-group"
-                      v-if="baseUrl === 'collection'"
+                      v-if="baseUrl === 'unit'"
                     >
                       <label>Task Manager:</label>
                       <select
@@ -219,8 +219,8 @@
                         v-model="entity.taskManager"
                         :disabled="
                           showEdit ||
-                            (baseUrl === 'collection' &&
-                              !accessControl._collection._update)
+                            (baseUrl === 'unit' &&
+                              !accessControl._unit._update)
                         "
                         :class="{
                           'error-border': submitted && !entity.taskManager,
@@ -968,7 +968,7 @@ export default {
     selectedCollection: sync("selectedCollection"),
     selectedItem: sync("selectedItem"),
     selectedFile: sync("selectedFile"),
-    itemConfigs: sync("itemConfigs"),
+    entityConfigs: sync("entityConfigs"),
     configProperties: sync("configProperties"),
     baseUrl() {
       const self = this;
@@ -980,7 +980,7 @@ export default {
         window.location.hash.toLowerCase().indexOf("collection") > -1 &&
         window.location.hash.toLowerCase().indexOf("item") === -1
       ) {
-        this.getItemsConfig();
+        this.getEntityConfigs();
         return "collection";
       } else if (window.location.hash.toLowerCase().indexOf("item") > -1) {
         return "item";
@@ -999,10 +999,10 @@ export default {
       );
     },
     listOfTaskManager() {
-      return this.itemConfigs.taskManagers;
+      return this.entityConfigs.taskManagers;
     },
     listOfExternalResources() {
-      return this.itemConfigs.externalSources;
+      return this.entityConfigs.externalSources;
     },
     mediaInfo() {
       return this.selectedFile && this.selectedFile.mediaInfo
@@ -1453,9 +1453,9 @@ export default {
     onInputChange(ev) {
       this.isDataChanged = true;
     },
-    async getItemsConfig() {
+    async getEntityConfigs() {
       const self = this;
-      self.entityService.getItemsConfig(self);
+      self.entityService.getEntityConfigs(self);
     },
     handleSearchItem() {
       this.$router.push("/collections/items/item-search");
diff --git a/src/service/entity-service.js b/src/service/entity-service.js
index 254416cd..b33cead0 100644
--- a/src/service/entity-service.js
+++ b/src/service/entity-service.js
@@ -21,6 +21,11 @@ export default class EntityService {
 
     async onUpdateEntityDetails(self) {
         if (self.baseUrl === 'unit') {
+            // unit Validation rules
+            if (!self.entity.name || !self.entity.taskManager) {
+                self.$bvToast.toast("Please provide required fields!", self.sharedService.erorrToastConfig);
+                return false;
+            }
             self.unitService.updateUnitDetails(self.selectedUnit.id, self.entity).then(response => {
                 self.isDataChanged = false;
                 self.$bvToast.toast("Unit details updated successfully.", self.sharedService.successToastConfig);
@@ -29,11 +34,9 @@ export default class EntityService {
             self.submitted = true;
 
             // Collection Validation rules
-            if (!self.entity.name || !self.entity.taskManager) {
-
+            if (!self.entity.name) {
                 self.$bvToast.toast("Please provide required fields!", self.sharedService.erorrToastConfig);
                 return false;
-
             }
             if (!self.isCreatePage) {
                 self.collectionService.updateCollection(self.entity).then(response => {
@@ -72,7 +75,8 @@ export default class EntityService {
             }
         } else if (self.baseUrl === 'file') {
             self.submitted = true;
-            // Collection Validation rules
+            
+            // file Validation rules
             if (!self.entity.name) {
                 self.$bvToast.toast("Please provide required fields!", self.sharedService.erorrToastConfig);
                 return false;
@@ -98,7 +102,7 @@ export default class EntityService {
         } else if (self.baseUrl === 'item') {
             self.submitted = true;
 
-            // Collection Validation rules
+            // item Validation rules
             if (!self.entity.name) {
                 self.$bvToast.toast("Please provide required fields!", self.sharedService.erorrToastConfig);
                 return false;
@@ -117,7 +121,6 @@ export default class EntityService {
                     self.selectedItem.selectedItemId = response.id;
                     self.isDataChanged = false;
                     self.$router.push("/collections/items/details");
-                    // self.$router.push("/collection/details");
                 }).catch(error => {
                     self.showLoader = false;
                     self.submitted = false;
@@ -133,7 +136,6 @@ export default class EntityService {
                 self.itemService.updateItem(self.entity).then(success => {
                     self.showLoader = false;
                     self.$bvToast.toast("Item details updated successfully", { title: 'Notification', appendToast: true, variant: "success", autoHideDelay: 5000 });
-                    // self.showEdit = !self.showEdit;
                     self.submitted = false;
                     self.isDataChanged = false;
                 }).catch(error => {
@@ -151,11 +153,11 @@ export default class EntityService {
         }
     }
 
-    async getItemsConfig(self) {
-        if(!self.itemConfigs.externalSources.length || !self.itemConfigs.taskManagers.length) {
-            await self.itemService.getItemsConfig().then(res => {
-                self.itemConfigs.externalSources = res.externalSources;
-                self.itemConfigs.taskManagers = res.taskManagers;
+    async getEntityConfigs(self) {
+        if(!self.entityConfigs.externalSources.length || !self.entityConfigs.taskManagers.length) {
+            await self.itemService.getEntityConfigs().then(res => {
+                self.entityConfigs.externalSources = res.externalSources;
+                self.entityConfigs.taskManagers = res.taskManagers;
             }).catch(err => {
                 self.$bvToast.toast("Unable to retrive config details. Please try again!", self.sharedService.erorrToastConfig);
             })
diff --git a/src/service/item-service.js b/src/service/item-service.js
index a986a868..6440ab5f 100644
--- a/src/service/item-service.js
+++ b/src/service/item-service.js
@@ -69,7 +69,7 @@ export default class ItemService extends BaseService{
      * @params obj, id
      */
 
-      async getItemsConfig(){
+      async getEntityConfigs(){
         var data = "";
         await super.get_auth(`/config?properties=externalSources,taskManagers`).then(result => data = result.data);
         return data;
diff --git a/src/store/state.js b/src/store/state.js
index eb9a2387..30a93ced 100644
--- a/src/store/state.js
+++ b/src/store/state.js
@@ -111,7 +111,7 @@ const state = {
   isAuthenticated: false,
   selectedFile: {},
   selectedFilters: {},
-  itemConfigs: {
+  entityConfigs: {
     externalSources: [],
     taskManagers: [],
   },
diff --git a/tests/unit/components/entity/EntityList.spec.js b/tests/unit/components/entity/EntityList.spec.js
index 7335666d..4db29cf8 100644
--- a/tests/unit/components/entity/EntityList.spec.js
+++ b/tests/unit/components/entity/EntityList.spec.js
@@ -68,7 +68,7 @@ jest.mock('../../../../src/service/primary-file-service',
         return jest.fn().mockImplementation(
             function () {
                 const superFn = {
-                    getItemsConfig: (id) => {
+                    getEntityConfigs: (id) => {
                         return Promise.resolve({"externalSources":["MCO","DarkAvalon"],"taskManagers":["Jira","Trello"]})
                     }
                 };
@@ -112,7 +112,7 @@ describe('EntityList.vue', () => {
             selectedUnit: {},
             selectedFile: {},
             selectedFilters: {},
-            itemConfigs: {
+            entityConfigs: {
                 externalSources: [],
                 taskManagers: []
             },
@@ -168,7 +168,7 @@ describe('EntityList.vue', () => {
     });
 
     it('should fetch config values', async () => {
-        await wrapper.vm.getItemsConfig();
-        expect(wrapper.vm.itemConfigs.externalSources.length).toBe(2)
+        await wrapper.vm.getEntityConfigs();
+        expect(wrapper.vm.entityConfigs.externalSources.length).toBe(2)
     });
 });
\ No newline at end of file