diff --git a/apps/edr-freight-api/src/modules/cargo-types/entities/cargo-type.entity.ts b/apps/edr-freight-api/src/modules/cargo-types/entities/cargo-type.entity.ts
index 752e9e965..14589ae4b 100644
--- a/apps/edr-freight-api/src/modules/cargo-types/entities/cargo-type.entity.ts
+++ b/apps/edr-freight-api/src/modules/cargo-types/entities/cargo-type.entity.ts
@@ -2,9 +2,9 @@ import { BaseEntity } from "@edr/api-common";
 import { Column, Entity, Index, ManyToOne, OneToMany, JoinColumn } from "typeorm";
 
 @Entity({ schema: "freight", name: "cargo_types" })
-@Index(["is_active"])
-@Index(["display_order"])
-@Index(["parent_group_id"])
+@Index(["isActive"])
+@Index(["displayOrder"])
+@Index(["parentGroupId"])
 export class CargoType extends BaseEntity {
   @Column({ name: "cargo_type_name", type: "varchar", length: 255, nullable: false })
   cargoTypeName!: string;
diff --git a/apps/edr-freight-api/src/modules/service-types/entities/service-type.entity.ts b/apps/edr-freight-api/src/modules/service-types/entities/service-type.entity.ts
index 986add2c1..756ece6e0 100644
--- a/apps/edr-freight-api/src/modules/service-types/entities/service-type.entity.ts
+++ b/apps/edr-freight-api/src/modules/service-types/entities/service-type.entity.ts
@@ -2,8 +2,8 @@ import { BaseEntity } from "@edr/api-common";
 import { Column, Entity, Index } from "typeorm";
 
 @Entity({ schema: "freight", name: "service_types" })
-@Index(["is_active"])
-@Index(["display_order"])
+@Index(["isActive"])
+@Index(["displayOrder"])
 export class ServiceType extends BaseEntity {
   @Column({ name: "service_name", type: "varchar", length: 255, nullable: false })
   serviceName!: string;