diff --git a/src/app/organization/entity-data-table-checks/create-enity-data-table-checks/create-enity-data-table-checks.component.html b/src/app/organization/entity-data-table-checks/create-entity-data-table-checks/create-entity-data-table-checks.component.html
similarity index 100%
rename from src/app/organization/entity-data-table-checks/create-enity-data-table-checks/create-enity-data-table-checks.component.html
rename to src/app/organization/entity-data-table-checks/create-entity-data-table-checks/create-entity-data-table-checks.component.html
diff --git a/src/app/organization/entity-data-table-checks/create-enity-data-table-checks/create-enity-data-table-checks.component.scss b/src/app/organization/entity-data-table-checks/create-entity-data-table-checks/create-entity-data-table-checks.component.scss
similarity index 100%
rename from src/app/organization/entity-data-table-checks/create-enity-data-table-checks/create-enity-data-table-checks.component.scss
rename to src/app/organization/entity-data-table-checks/create-entity-data-table-checks/create-entity-data-table-checks.component.scss
diff --git a/src/app/organization/entity-data-table-checks/create-enity-data-table-checks/create-enity-data-table-checks.component.ts b/src/app/organization/entity-data-table-checks/create-entity-data-table-checks/create-entity-data-table-checks.component.ts
similarity index 87%
rename from src/app/organization/entity-data-table-checks/create-enity-data-table-checks/create-enity-data-table-checks.component.ts
rename to src/app/organization/entity-data-table-checks/create-entity-data-table-checks/create-entity-data-table-checks.component.ts
index e8a4a7f27..1a7c23655 100644
--- a/src/app/organization/entity-data-table-checks/create-enity-data-table-checks/create-enity-data-table-checks.component.ts
+++ b/src/app/organization/entity-data-table-checks/create-entity-data-table-checks/create-entity-data-table-checks.component.ts
@@ -17,14 +17,14 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
  * Create Entity Data Table Checks component.
  */
 @Component({
-  selector: 'mifosx-create-enity-data-table-checks',
-  templateUrl: './create-enity-data-table-checks.component.html',
-  styleUrls: ['./create-enity-data-table-checks.component.scss'],
+  selector: 'mifosx-create-entity-data-table-checks',
+  templateUrl: './create-entity-data-table-checks.component.html',
+  styleUrls: ['./create-entity-data-table-checks.component.scss'],
   imports: [
     ...STANDALONE_SHARED_IMPORTS
   ]
 })
-export class CreateEnityDataTableChecksComponent implements OnInit {
+export class CreateEntityDataTableChecksComponent implements OnInit {
   /** Create Entity Datatable Checks form. */
   createEntityForm: UntypedFormGroup;
   /** Entity Datatable Checks data. */
@@ -53,11 +53,12 @@ export class CreateEnityDataTableChecksComponent implements OnInit {
   ) {
     this.route.data.subscribe((data: { dataTableEntity: any }) => {
       this.createEntityData = data.dataTableEntity;
+      // hardcoded, because data.dataTableEntity.entities might change anytime its order
       this.entityTypes = [
-        { name: 'Client', value: this.createEntityData.entities[0] },
-        { name: 'Loan', value: this.createEntityData.entities[1] },
-        { name: 'Group', value: this.createEntityData.entities[2] },
-        { name: 'Savings Account', value: this.createEntityData.entities[3] }
+        { name: 'Client', value: 'm_client' },
+        { name: 'Loan', value: 'm_loan' },
+        { name: 'Group', value: 'm_group' },
+        { name: 'Savings Account', value: 'm_savings_account' }
       ];
     });
   }
diff --git a/src/app/organization/organization-routing.module.ts b/src/app/organization/organization-routing.module.ts
index ffe64ba1b..3cb00a607 100644
--- a/src/app/organization/organization-routing.module.ts
+++ b/src/app/organization/organization-routing.module.ts
@@ -52,7 +52,7 @@ import { ViewBulkImportComponent } from './bulk-import/view-bulk-import/view-bul
 import { ViewLoanProvisioningCriteriaComponent } from './loan-provisioning-criteria/view-loan-provisioning-criteria/view-loan-provisioning-criteria.component';
 import { CreateCampaignComponent } from './sms-campaigns/create-campaign/create-campaign.component';
 import { EditCampaignComponent } from './sms-campaigns/edit-campaign/edit-campaign.component';
-import { CreateEnityDataTableChecksComponent } from './entity-data-table-checks/create-enity-data-table-checks/create-enity-data-table-checks.component';
+import { CreateEntityDataTableChecksComponent } from './entity-data-table-checks/create-entity-data-table-checks/create-entity-data-table-checks.component';
 import { CreateLoanProvisioningCriteriaComponent } from './loan-provisioning-criteria/create-loan-provisioning-criteria/create-loan-provisioning-criteria.component';
 import { BulkLoanReassignmnetComponent } from './bulk-loan-reassignmnet/bulk-loan-reassignmnet.component';
 import { EditLoanProvisioningCriteriaComponent } from './loan-provisioning-criteria/edit-loan-provisioning-criteria/edit-loan-provisioning-criteria.component';
@@ -568,7 +568,7 @@ const routes: Routes = [
             },
             {
               path: 'create',
-              component: CreateEnityDataTableChecksComponent,
+              component: CreateEntityDataTableChecksComponent,
               data: { title: 'Create Entity Data Table Checks', breadcrumb: 'Create' },
               resolve: {
                 dataTableEntity: EntityDataTableChecksTemplateResolver
diff --git a/src/app/organization/organization.module.ts b/src/app/organization/organization.module.ts
index a0a2b226c..6c7f11a31 100644
--- a/src/app/organization/organization.module.ts
+++ b/src/app/organization/organization.module.ts
@@ -60,7 +60,7 @@ import { BusinessRuleParametersComponent } from './sms-campaigns/sms-campaign-st
 import { EditCampaignComponent } from './sms-campaigns/edit-campaign/edit-campaign.component';
 import { EditSmsCampaignStepComponent } from './sms-campaigns/sms-campaign-stepper/edit-sms-campaign-step/edit-sms-campaign-step.component';
 import { EditBusinessRuleParametersComponent } from './sms-campaigns/sms-campaign-stepper/edit-sms-campaign-step/edit-business-rule-parameters/edit-business-rule-parameters.component';
-import { CreateEnityDataTableChecksComponent } from './entity-data-table-checks/create-enity-data-table-checks/create-enity-data-table-checks.component';
+import { CreateEntityDataTableChecksComponent } from './entity-data-table-checks/create-entity-data-table-checks/create-entity-data-table-checks.component';
 import { BulkLoanReassignmnetComponent } from './bulk-loan-reassignmnet/bulk-loan-reassignmnet.component';
 import { CreateLoanProvisioningCriteriaComponent } from './loan-provisioning-criteria/create-loan-provisioning-criteria/create-loan-provisioning-criteria.component';
 import { EditLoanProvisioningCriteriaComponent } from './loan-provisioning-criteria/edit-loan-provisioning-criteria/edit-loan-provisioning-criteria.component';
@@ -141,7 +141,7 @@ import { InvestorsComponent } from './investors/investors.component';
     EditCampaignComponent,
     EditSmsCampaignStepComponent,
     EditBusinessRuleParametersComponent,
-    CreateEnityDataTableChecksComponent,
+    CreateEntityDataTableChecksComponent,
     BulkLoanReassignmnetComponent,
     CreateLoanProvisioningCriteriaComponent,
     EditLoanProvisioningCriteriaComponent,