Refactored Org Resource and Governance to use internal org_governance_name field