Ref: sql file not up to date
Fix: Uniformize field names