change org_id to org and org_id