Merge remote-tracking branch 'origin/opmxwell-patch-5' into opmxwell-…

…mega-branch

src/docs/governance/citizenship.md

@@ -8,9 +8,9 @@ This is distinct from the more common pattern of token-voting governance (as use
 
 <img width="auto" alt="Optimism Identity" src="https://user-images.githubusercontent.com/27849965/219097012-a21ebb1f-66dc-47a8-8b3f-6382774ad5d6.png">
 
-In the initial stage of bootstrapping the Citizens' House, participants receive temporary badges to vote in RetroPGF rounds.
+In the initial stage of bootstrapping the Citizens' House, participants receive temporary badges to vote in Retro Funding rounds.
 In future stages, the Token House and Citizens’ House together will collaborate on ongoing criteria for participation in the Citizens’ House. 
-This means the criteria for Citizenship will evolve over time. Holding a voting badge does not guarantee voting rights in future rounds of RetroPGF, as eventually membership will be determined by governance and may change.
+This means the criteria for Citizenship will evolve over time. Holding a voting badge does not guarantee voting rights in future rounds of Retro Funding, as eventually membership will be determined by governance and may change.
 
 **How will Citizenship Selection work?**
 
@@ -23,9 +23,8 @@ This system is designed to be flexible and future-proof; rather than prescribe c
 For more information on Optimism's identity layer, visit the [AttestationStation documentation](../identity/). 
 
 ## Becoming a Citizen
-In the current phase of Citizens' House governance the number of voting badges is growing with each round of RetroPGF:
-RetroPGF [round 1](./retropgf-1.md) had 24 badgeholders participate, [round 2](./retropgf-2.md) saw 71 badgeholders participate, and in [round 3](./retropgf-3.md) voting badges will be offered to 208 community members.  
+In the current phase of Citizens' House governance the number of voting badges is growing with each round of Retro Funding:
+Retro Funding [round 1](./retropgf-1.md) had 24 badgeholders participate, [round 2](./retropgf-2.md) saw 71 badgeholders participate, and in [round 3](./retropgf-3.md) voting badges will be offered to 208 community members.  
 Eventually, Citizenship is intended to be widely distributed to a large group of humans across the Optimism ecosystem with expertise in many different subcultures and industries. Optimism governance will have the power to set criteria for Citizenship. 
 
-This means voting eligibility may someday be subject to rules and restrictions unknown today. Voting in RetroPGF 3 does not guarantee permanent participation in the Citizens’ House and future iterations of RetroPGF.
-
+This means voting eligibility may someday be subject to rules and restrictions unknown today. Voting in Retro Funding 3 does not guarantee permanent participation in the Citizens’ House and future iterations of Retro Funding.