diff --git a/contracts/generated/ocr2/.gitkeep b/contracts/generated/ocr_2/.gitkeep
similarity index 100%
rename from contracts/generated/ocr2/.gitkeep
rename to contracts/generated/ocr_2/.gitkeep
diff --git a/contracts/generated/ocr2/AcceptOwnership.go b/contracts/generated/ocr_2/AcceptOwnership.go
similarity index 100%
rename from contracts/generated/ocr2/AcceptOwnership.go
rename to contracts/generated/ocr_2/AcceptOwnership.go
diff --git a/contracts/generated/ocr2/AcceptOwnership_test.go b/contracts/generated/ocr_2/AcceptOwnership_test.go
similarity index 100%
rename from contracts/generated/ocr2/AcceptOwnership_test.go
rename to contracts/generated/ocr_2/AcceptOwnership_test.go
diff --git a/contracts/generated/ocr2/AcceptPayeeship.go b/contracts/generated/ocr_2/AcceptPayeeship.go
similarity index 100%
rename from contracts/generated/ocr2/AcceptPayeeship.go
rename to contracts/generated/ocr_2/AcceptPayeeship.go
diff --git a/contracts/generated/ocr2/AcceptPayeeship_test.go b/contracts/generated/ocr_2/AcceptPayeeship_test.go
similarity index 100%
rename from contracts/generated/ocr2/AcceptPayeeship_test.go
rename to contracts/generated/ocr_2/AcceptPayeeship_test.go
diff --git a/contracts/generated/ocr2/AcceptProposal.go b/contracts/generated/ocr_2/AcceptProposal.go
similarity index 100%
rename from contracts/generated/ocr2/AcceptProposal.go
rename to contracts/generated/ocr_2/AcceptProposal.go
diff --git a/contracts/generated/ocr2/AcceptProposal_test.go b/contracts/generated/ocr_2/AcceptProposal_test.go
similarity index 100%
rename from contracts/generated/ocr2/AcceptProposal_test.go
rename to contracts/generated/ocr_2/AcceptProposal_test.go
diff --git a/contracts/generated/ocr2/Close.go b/contracts/generated/ocr_2/Close.go
similarity index 100%
rename from contracts/generated/ocr2/Close.go
rename to contracts/generated/ocr_2/Close.go
diff --git a/contracts/generated/ocr2/CloseProposal.go b/contracts/generated/ocr_2/CloseProposal.go
similarity index 100%
rename from contracts/generated/ocr2/CloseProposal.go
rename to contracts/generated/ocr_2/CloseProposal.go
diff --git a/contracts/generated/ocr2/CloseProposal_test.go b/contracts/generated/ocr_2/CloseProposal_test.go
similarity index 100%
rename from contracts/generated/ocr2/CloseProposal_test.go
rename to contracts/generated/ocr_2/CloseProposal_test.go
diff --git a/contracts/generated/ocr2/Close_test.go b/contracts/generated/ocr_2/Close_test.go
similarity index 100%
rename from contracts/generated/ocr2/Close_test.go
rename to contracts/generated/ocr_2/Close_test.go
diff --git a/contracts/generated/ocr2/CreateProposal.go b/contracts/generated/ocr_2/CreateProposal.go
similarity index 100%
rename from contracts/generated/ocr2/CreateProposal.go
rename to contracts/generated/ocr_2/CreateProposal.go
diff --git a/contracts/generated/ocr2/CreateProposal_test.go b/contracts/generated/ocr_2/CreateProposal_test.go
similarity index 100%
rename from contracts/generated/ocr2/CreateProposal_test.go
rename to contracts/generated/ocr_2/CreateProposal_test.go
diff --git a/contracts/generated/ocr2/FinalizeProposal.go b/contracts/generated/ocr_2/FinalizeProposal.go
similarity index 100%
rename from contracts/generated/ocr2/FinalizeProposal.go
rename to contracts/generated/ocr_2/FinalizeProposal.go
diff --git a/contracts/generated/ocr2/FinalizeProposal_test.go b/contracts/generated/ocr_2/FinalizeProposal_test.go
similarity index 100%
rename from contracts/generated/ocr2/FinalizeProposal_test.go
rename to contracts/generated/ocr_2/FinalizeProposal_test.go
diff --git a/contracts/generated/ocr2/Initialize.go b/contracts/generated/ocr_2/Initialize.go
similarity index 100%
rename from contracts/generated/ocr2/Initialize.go
rename to contracts/generated/ocr_2/Initialize.go
diff --git a/contracts/generated/ocr2/Initialize_test.go b/contracts/generated/ocr_2/Initialize_test.go
similarity index 100%
rename from contracts/generated/ocr2/Initialize_test.go
rename to contracts/generated/ocr_2/Initialize_test.go
diff --git a/contracts/generated/ocr2/PayOracles.go b/contracts/generated/ocr_2/PayOracles.go
similarity index 100%
rename from contracts/generated/ocr2/PayOracles.go
rename to contracts/generated/ocr_2/PayOracles.go
diff --git a/contracts/generated/ocr2/PayOracles_test.go b/contracts/generated/ocr_2/PayOracles_test.go
similarity index 100%
rename from contracts/generated/ocr2/PayOracles_test.go
rename to contracts/generated/ocr_2/PayOracles_test.go
diff --git a/contracts/generated/ocr2/ProposeConfig.go b/contracts/generated/ocr_2/ProposeConfig.go
similarity index 100%
rename from contracts/generated/ocr2/ProposeConfig.go
rename to contracts/generated/ocr_2/ProposeConfig.go
diff --git a/contracts/generated/ocr2/ProposeConfig_test.go b/contracts/generated/ocr_2/ProposeConfig_test.go
similarity index 100%
rename from contracts/generated/ocr2/ProposeConfig_test.go
rename to contracts/generated/ocr_2/ProposeConfig_test.go
diff --git a/contracts/generated/ocr2/ProposePayees.go b/contracts/generated/ocr_2/ProposePayees.go
similarity index 100%
rename from contracts/generated/ocr2/ProposePayees.go
rename to contracts/generated/ocr_2/ProposePayees.go
diff --git a/contracts/generated/ocr2/ProposePayees_test.go b/contracts/generated/ocr_2/ProposePayees_test.go
similarity index 100%
rename from contracts/generated/ocr2/ProposePayees_test.go
rename to contracts/generated/ocr_2/ProposePayees_test.go
diff --git a/contracts/generated/ocr2/RequestNewRound.go b/contracts/generated/ocr_2/RequestNewRound.go
similarity index 100%
rename from contracts/generated/ocr2/RequestNewRound.go
rename to contracts/generated/ocr_2/RequestNewRound.go
diff --git a/contracts/generated/ocr2/RequestNewRound_test.go b/contracts/generated/ocr_2/RequestNewRound_test.go
similarity index 100%
rename from contracts/generated/ocr2/RequestNewRound_test.go
rename to contracts/generated/ocr_2/RequestNewRound_test.go
diff --git a/contracts/generated/ocr2/SetBilling.go b/contracts/generated/ocr_2/SetBilling.go
similarity index 100%
rename from contracts/generated/ocr2/SetBilling.go
rename to contracts/generated/ocr_2/SetBilling.go
diff --git a/contracts/generated/ocr2/SetBillingAccessController.go b/contracts/generated/ocr_2/SetBillingAccessController.go
similarity index 100%
rename from contracts/generated/ocr2/SetBillingAccessController.go
rename to contracts/generated/ocr_2/SetBillingAccessController.go
diff --git a/contracts/generated/ocr2/SetBillingAccessController_test.go b/contracts/generated/ocr_2/SetBillingAccessController_test.go
similarity index 100%
rename from contracts/generated/ocr2/SetBillingAccessController_test.go
rename to contracts/generated/ocr_2/SetBillingAccessController_test.go
diff --git a/contracts/generated/ocr2/SetBilling_test.go b/contracts/generated/ocr_2/SetBilling_test.go
similarity index 100%
rename from contracts/generated/ocr2/SetBilling_test.go
rename to contracts/generated/ocr_2/SetBilling_test.go
diff --git a/contracts/generated/ocr2/SetRequesterAccessController.go b/contracts/generated/ocr_2/SetRequesterAccessController.go
similarity index 100%
rename from contracts/generated/ocr2/SetRequesterAccessController.go
rename to contracts/generated/ocr_2/SetRequesterAccessController.go
diff --git a/contracts/generated/ocr2/SetRequesterAccessController_test.go b/contracts/generated/ocr_2/SetRequesterAccessController_test.go
similarity index 100%
rename from contracts/generated/ocr2/SetRequesterAccessController_test.go
rename to contracts/generated/ocr_2/SetRequesterAccessController_test.go
diff --git a/contracts/generated/ocr2/TransferOwnership.go b/contracts/generated/ocr_2/TransferOwnership.go
similarity index 100%
rename from contracts/generated/ocr2/TransferOwnership.go
rename to contracts/generated/ocr_2/TransferOwnership.go
diff --git a/contracts/generated/ocr2/TransferOwnership_test.go b/contracts/generated/ocr_2/TransferOwnership_test.go
similarity index 100%
rename from contracts/generated/ocr2/TransferOwnership_test.go
rename to contracts/generated/ocr_2/TransferOwnership_test.go
diff --git a/contracts/generated/ocr2/TransferPayeeship.go b/contracts/generated/ocr_2/TransferPayeeship.go
similarity index 100%
rename from contracts/generated/ocr2/TransferPayeeship.go
rename to contracts/generated/ocr_2/TransferPayeeship.go
diff --git a/contracts/generated/ocr2/TransferPayeeship_test.go b/contracts/generated/ocr_2/TransferPayeeship_test.go
similarity index 100%
rename from contracts/generated/ocr2/TransferPayeeship_test.go
rename to contracts/generated/ocr_2/TransferPayeeship_test.go
diff --git a/contracts/generated/ocr2/WithdrawFunds.go b/contracts/generated/ocr_2/WithdrawFunds.go
similarity index 100%
rename from contracts/generated/ocr2/WithdrawFunds.go
rename to contracts/generated/ocr_2/WithdrawFunds.go
diff --git a/contracts/generated/ocr2/WithdrawFunds_test.go b/contracts/generated/ocr_2/WithdrawFunds_test.go
similarity index 100%
rename from contracts/generated/ocr2/WithdrawFunds_test.go
rename to contracts/generated/ocr_2/WithdrawFunds_test.go
diff --git a/contracts/generated/ocr2/WithdrawPayment.go b/contracts/generated/ocr_2/WithdrawPayment.go
similarity index 100%
rename from contracts/generated/ocr2/WithdrawPayment.go
rename to contracts/generated/ocr_2/WithdrawPayment.go
diff --git a/contracts/generated/ocr2/WithdrawPayment_test.go b/contracts/generated/ocr_2/WithdrawPayment_test.go
similarity index 100%
rename from contracts/generated/ocr2/WithdrawPayment_test.go
rename to contracts/generated/ocr_2/WithdrawPayment_test.go
diff --git a/contracts/generated/ocr2/WriteOffchainConfig.go b/contracts/generated/ocr_2/WriteOffchainConfig.go
similarity index 100%
rename from contracts/generated/ocr2/WriteOffchainConfig.go
rename to contracts/generated/ocr_2/WriteOffchainConfig.go
diff --git a/contracts/generated/ocr2/WriteOffchainConfig_test.go b/contracts/generated/ocr_2/WriteOffchainConfig_test.go
similarity index 100%
rename from contracts/generated/ocr2/WriteOffchainConfig_test.go
rename to contracts/generated/ocr_2/WriteOffchainConfig_test.go
diff --git a/contracts/generated/ocr2/accounts.go b/contracts/generated/ocr_2/accounts.go
similarity index 100%
rename from contracts/generated/ocr2/accounts.go
rename to contracts/generated/ocr_2/accounts.go
diff --git a/contracts/generated/ocr2/instructions.go b/contracts/generated/ocr_2/instructions.go
similarity index 100%
rename from contracts/generated/ocr2/instructions.go
rename to contracts/generated/ocr_2/instructions.go
diff --git a/contracts/generated/ocr2/testing_utils.go b/contracts/generated/ocr_2/testing_utils.go
similarity index 100%
rename from contracts/generated/ocr2/testing_utils.go
rename to contracts/generated/ocr_2/testing_utils.go
diff --git a/contracts/generated/ocr2/types.go b/contracts/generated/ocr_2/types.go
similarity index 100%
rename from contracts/generated/ocr2/types.go
rename to contracts/generated/ocr_2/types.go
diff --git a/integration-tests/solclient/deployer.go b/integration-tests/solclient/deployer.go
index 63089f1f5..f04c5d763 100644
--- a/integration-tests/solclient/deployer.go
+++ b/integration-tests/solclient/deployer.go
@@ -17,7 +17,7 @@ import (
 	"golang.org/x/sync/errgroup"
 
 	access_controller2 "github.com/smartcontractkit/chainlink-solana/contracts/generated/access_controller"
-	ocr_2 "github.com/smartcontractkit/chainlink-solana/contracts/generated/ocr2"
+	ocr_2 "github.com/smartcontractkit/chainlink-solana/contracts/generated/ocr_2"
 	store2 "github.com/smartcontractkit/chainlink-solana/contracts/generated/store"
 	test_env_sol "github.com/smartcontractkit/chainlink-solana/integration-tests/docker/test_env"
 )
diff --git a/integration-tests/solclient/ocr2.go b/integration-tests/solclient/ocr2.go
index 2c8ac7598..3df8e7889 100644
--- a/integration-tests/solclient/ocr2.go
+++ b/integration-tests/solclient/ocr2.go
@@ -13,7 +13,7 @@ import (
 	"github.com/smartcontractkit/chainlink/integration-tests/contracts"
 	"github.com/smartcontractkit/libocr/offchainreporting2/confighelper"
 
-	ocr_2 "github.com/smartcontractkit/chainlink-solana/contracts/generated/ocr2"
+	ocr_2 "github.com/smartcontractkit/chainlink-solana/contracts/generated/ocr_2"
 	"github.com/smartcontractkit/chainlink-solana/integration-tests/utils"
 )