added uppercase matching to org_name