diff --git a/apps/edr-freight-api/src/modules/drivers/entities/driver.entity.ts b/apps/edr-freight-api/src/modules/drivers/entities/driver.entity.ts
index e4610d79a..9f7a37b7c 100644
--- a/apps/edr-freight-api/src/modules/drivers/entities/driver.entity.ts
+++ b/apps/edr-freight-api/src/modules/drivers/entities/driver.entity.ts
@@ -14,43 +14,43 @@ export enum DriverStatus {
 @Index(['phoneNumber'])
 @Index(['status'])
 export class Driver extends BaseEntity {
-  @Column({ name: 'license_number', unique: true })
+  @Column({ unique: true })
   licenseNumber!: string;
 
-  @Column({ name: 'first_name' })
+  @Column()
   firstName!: string;
 
-  @Column({ name: 'last_name' })
+  @Column()
   lastName!: string;
 
   @Column({ unique: true })
   email!: string;
 
-  @Column({ name: 'phone_number', unique: true })
+  @Column({ unique: true })
   phoneNumber!: string;
 
-  @Column({ name: 'date_of_birth', type: 'date' })
+  @Column({ type: 'date' })
   dateOfBirth!: Date;
 
-  @Column({ name: 'license_expiry_date', type: 'date' })
+  @Column({ type: 'date' })
   licenseExpiryDate!: Date;
 
   @Column({ type: 'varchar', default: DriverStatus.ACTIVE })
   status!: DriverStatus;
 
-  @Column({ name: 'vehicle_types_authorized', type: 'varchar', array: true, nullable: true })
+  @Column({ type: 'varchar', array: true, nullable: true })
   vehicleTypesAuthorized?: string[];
 
   @Column({ type: 'text', nullable: true })
   address!: string | null;
 
-  @Column({ name: 'emergency_contact', type: 'varchar', nullable: true })
+  @Column({ type: 'varchar', nullable: true })
   emergencyContact!: string | null;
 
   @Column({ type: 'text', nullable: true })
   notes!: string | null;
 
-  @Column({ name: 'total_trips', type: 'int', default: 0 })
+  @Column({ type: 'int', default: 0 })
   totalTrips!: number;
 
   @Column({ type: 'numeric', precision: 3, scale: 2, nullable: true })