diff --git a/cspell.json b/cspell.json
index f6e8f1ecf0c..1e9853b9d54 100644
--- a/cspell.json
+++ b/cspell.json
@@ -102,7 +102,6 @@
     "fullpath",
     "fuzzer",
     "fuzzers",
-    "Gerousia",
     "gitmodules",
     "gitrepo",
     "Gossipable",
diff --git a/l1-contracts/test/governance/governance/updateGerousia.t.sol b/l1-contracts/test/governance/governance/updateGovernanceProposer.t.sol
similarity index 100%
rename from l1-contracts/test/governance/governance/updateGerousia.t.sol
rename to l1-contracts/test/governance/governance/updateGovernanceProposer.t.sol
diff --git a/l1-contracts/test/governance/governance/updateGerousia.tree b/l1-contracts/test/governance/governance/updateGovernanceProposer.tree
similarity index 100%
rename from l1-contracts/test/governance/governance/updateGerousia.tree
rename to l1-contracts/test/governance/governance/updateGovernanceProposer.tree
diff --git a/spartan/aztec-network/files/config/config-prover-env.sh b/spartan/aztec-network/files/config/config-prover-env.sh
index ccf55f15f09..4ee7106cb73 100644
--- a/spartan/aztec-network/files/config/config-prover-env.sh
+++ b/spartan/aztec-network/files/config/config-prover-env.sh
@@ -17,7 +17,7 @@ outbox_address=$(echo "$output" | grep -oP 'L2 -> L1 Outbox Address: \K0x[a-fA-F
 fee_juice_address=$(echo "$output" | grep -oP 'Fee Juice Address: \K0x[a-fA-F0-9]{40}')
 fee_juice_portal_address=$(echo "$output" | grep -oP 'Fee Juice Portal Address: \K0x[a-fA-F0-9]{40}')
 coin_issuer_address=$(echo "$output" | grep -oP 'CoinIssuer Address: \K0x[a-fA-F0-9]{40}')
-rewardDistributor_address=$(echo "$output" | grep -oP 'RewardDistributor Address: \K0x[a-fA-F0-9]{40}')
+reward_distributor_address=$(echo "$output" | grep -oP 'RewardDistributor Address: \K0x[a-fA-F0-9]{40}')
 governance_proposer_address=$(echo "$output" | grep -oP 'GovernanceProposer Address: \K0x[a-fA-F0-9]{40}')
 governance_address=$(echo "$output" | grep -oP 'Governance Address: \K0x[a-fA-F0-9]{40}')
 
@@ -31,7 +31,7 @@ export OUTBOX_CONTRACT_ADDRESS=$outbox_address
 export FEE_JUICE_CONTRACT_ADDRESS=$fee_juice_address
 export FEE_JUICE_PORTAL_CONTRACT_ADDRESS=$fee_juice_portal_address
 export COIN_ISSUER_CONTRACT_ADDRESS=$coin_issuer_address
-export REWARD_DISTRIBUTOR_CONTRACT_ADDRESS=$rewardDistributor_address
+export REWARD_DISTRIBUTOR_CONTRACT_ADDRESS=$reward_distributor_address
 export GOVERNANCE_PROPOSER_CONTRACT_ADDRESS=$governance_proposer_address
 export GOVERNANCE_CONTRACT_ADDRESS=$governance_address
 EOF
diff --git a/spartan/aztec-network/files/config/config-validator-env.sh b/spartan/aztec-network/files/config/config-validator-env.sh
index f6d1a88e193..174482492c4 100644
--- a/spartan/aztec-network/files/config/config-validator-env.sh
+++ b/spartan/aztec-network/files/config/config-validator-env.sh
@@ -17,7 +17,7 @@ outbox_address=$(echo "$output" | grep -oP 'L2 -> L1 Outbox Address: \K0x[a-fA-F
 fee_juice_address=$(echo "$output" | grep -oP 'Fee Juice Address: \K0x[a-fA-F0-9]{40}')
 fee_juice_portal_address=$(echo "$output" | grep -oP 'Fee Juice Portal Address: \K0x[a-fA-F0-9]{40}')
 coin_issuer_address=$(echo "$output" | grep -oP 'CoinIssuer Address: \K0x[a-fA-F0-9]{40}')
-rewardDistributor_address=$(echo "$output" | grep -oP 'RewardDistributor Address: \K0x[a-fA-F0-9]{40}')
+reward_distributor_address=$(echo "$output" | grep -oP 'RewardDistributor Address: \K0x[a-fA-F0-9]{40}')
 governance_proposer_address=$(echo "$output" | grep -oP 'GovernanceProposer Address: \K0x[a-fA-F0-9]{40}')
 governance_address=$(echo "$output" | grep -oP 'Governance Address: \K0x[a-fA-F0-9]{40}')
 # We assume that there is an env var set for validator keys from the config map
@@ -37,7 +37,7 @@ export OUTBOX_CONTRACT_ADDRESS=$outbox_address
 export FEE_JUICE_CONTRACT_ADDRESS=$fee_juice_address
 export FEE_JUICE_PORTAL_CONTRACT_ADDRESS=$fee_juice_portal_address
 export COIN_ISSUER_CONTRACT_ADDRESS=$coin_issuer_address
-export REWARD_DISTRIBUTOR_CONTRACT_ADDRESS=$rewardDistributor_address
+export REWARD_DISTRIBUTOR_CONTRACT_ADDRESS=$reward_distributor_address
 export GOVERNANCE_PROPOSER_CONTRACT_ADDRESS=$governance_proposer_address
 export GOVERNANCE_CONTRACT_ADDRESS=$governance_address
 export VALIDATOR_PRIVATE_KEY=$private_key
diff --git a/spartan/aztec-network/files/config/deploy-l1-contracts.sh b/spartan/aztec-network/files/config/deploy-l1-contracts.sh
index ae010e6b165..114820ff4a1 100644
--- a/spartan/aztec-network/files/config/deploy-l1-contracts.sh
+++ b/spartan/aztec-network/files/config/deploy-l1-contracts.sh
@@ -22,7 +22,7 @@ outbox_address=$(echo "$output" | grep -oP 'L2 -> L1 Outbox Address: \K0x[a-fA-F
 fee_juice_address=$(echo "$output" | grep -oP 'Fee Juice Address: \K0x[a-fA-F0-9]{40}')
 fee_juice_portal_address=$(echo "$output" | grep -oP 'Fee Juice Portal Address: \K0x[a-fA-F0-9]{40}')
 coin_issuer_address=$(echo "$output" | grep -oP 'CoinIssuer Address: \K0x[a-fA-F0-9]{40}')
-rewardDistributor_address=$(echo "$output" | grep -oP 'RewardDistributor Address: \K0x[a-fA-F0-9]{40}')
+reward_distributor_address=$(echo "$output" | grep -oP 'RewardDistributor Address: \K0x[a-fA-F0-9]{40}')
 governance_proposer_address=$(echo "$output" | grep -oP 'GovernanceProposer Address: \K0x[a-fA-F0-9]{40}')
 governance_address=$(echo "$output" | grep -oP 'Governance Address: \K0x[a-fA-F0-9]{40}')
 
@@ -35,7 +35,7 @@ export OUTBOX_CONTRACT_ADDRESS=$outbox_address
 export FEE_JUICE_CONTRACT_ADDRESS=$fee_juice_address
 export FEE_JUICE_PORTAL_CONTRACT_ADDRESS=$fee_juice_portal_address
 export COIN_ISSUER_CONTRACT_ADDRESS=$coin_issuer_address
-export REWARD_DISTRIBUTOR_CONTRACT_ADDRESS=$rewardDistributor_address
+export REWARD_DISTRIBUTOR_CONTRACT_ADDRESS=$reward_distributor_address
 export GOVERNANCE_PROPOSER_CONTRACT_ADDRESS=$governance_proposer_address
 export GOVERNANCE_CONTRACT_ADDRESS=$governance_address
 EOF
diff --git a/yarn-project/end-to-end/src/e2e_p2p/upgrade_governance_proposer.test.ts b/yarn-project/end-to-end/src/e2e_p2p/upgrade_governance_proposer.test.ts
index 834f73bef15..1340958204a 100644
--- a/yarn-project/end-to-end/src/e2e_p2p/upgrade_governance_proposer.test.ts
+++ b/yarn-project/end-to-end/src/e2e_p2p/upgrade_governance_proposer.test.ts
@@ -1,8 +1,8 @@
 import { type AztecNodeService } from '@aztec/aztec-node';
 import { deployL1Contract, sleep } from '@aztec/aztec.js';
 import {
-  GovernanceAbi,
   TestERC20Abi as FeeJuiceAbi,
+  GovernanceAbi,
   GovernanceProposerAbi,
   NewGovernanceProposerPayloadAbi,
   NewGovernanceProposerPayloadBytecode,