diff --git a/contracts/script/Manage.s.sol b/contracts/script/Manage.s.sol
index 26b9ed3a..54c21ced 100644
--- a/contracts/script/Manage.s.sol
+++ b/contracts/script/Manage.s.sol
@@ -18,8 +18,8 @@ pragma solidity ^0.8.9;
 
 import {Script} from "forge-std/Script.sol";
 import {console2} from "forge-std/console2.sol";
-import {Strings} from "openzeppelin/contracts/utils/Strings.sol";
-import {TimelockController} from "openzeppelin/contracts/governance/TimelockController.sol";
+import {Strings} from "openzeppelin-contracts/utils/Strings.sol";
+import {TimelockController} from "openzeppelin-contracts/governance/TimelockController.sol";
 import {RiscZeroVerifierRouter} from "../src/RiscZeroVerifierRouter.sol";
 import {RiscZeroVerifierEmergencyStop} from "../src/RiscZeroVerifierEmergencyStop.sol";
 import {IRiscZeroVerifier} from "../src/IRiscZeroVerifier.sol";
diff --git a/contracts/src/RiscZeroSetVerifier.sol b/contracts/src/RiscZeroSetVerifier.sol
index dc5bfda3..501b4fb8 100644
--- a/contracts/src/RiscZeroSetVerifier.sol
+++ b/contracts/src/RiscZeroSetVerifier.sol
@@ -16,7 +16,7 @@
 
 pragma solidity ^0.8.20;
 
-import {MerkleProof} from "openzeppelin/contracts/utils/cryptography/MerkleProof.sol";
+import {MerkleProof} from "openzeppelin-contracts/utils/cryptography/MerkleProof.sol";
 import {IRiscZeroVerifier, Receipt, ReceiptClaim, ReceiptClaimLib, VerificationFailed} from "./IRiscZeroVerifier.sol";
 import {IRiscZeroSetVerifier, Seal} from "./IRiscZeroSetVerifier.sol";
 
diff --git a/contracts/src/RiscZeroVerifierEmergencyStop.sol b/contracts/src/RiscZeroVerifierEmergencyStop.sol
index f7619abe..d5e92878 100644
--- a/contracts/src/RiscZeroVerifierEmergencyStop.sol
+++ b/contracts/src/RiscZeroVerifierEmergencyStop.sol
@@ -16,8 +16,8 @@
 
 pragma solidity ^0.8.9;
 
-import {Ownable, Ownable2Step} from "openzeppelin/contracts/access/Ownable2Step.sol";
-import {Pausable} from "openzeppelin/contracts/utils/Pausable.sol";
+import {Ownable, Ownable2Step} from "openzeppelin-contracts/access/Ownable2Step.sol";
+import {Pausable} from "openzeppelin-contracts/utils/Pausable.sol";
 
 import {IRiscZeroVerifier, Receipt} from "./IRiscZeroVerifier.sol";
 
diff --git a/contracts/src/RiscZeroVerifierRouter.sol b/contracts/src/RiscZeroVerifierRouter.sol
index 93475f15..c1f03dc7 100644
--- a/contracts/src/RiscZeroVerifierRouter.sol
+++ b/contracts/src/RiscZeroVerifierRouter.sol
@@ -16,7 +16,7 @@
 
 pragma solidity ^0.8.9;
 
-import {Ownable, Ownable2Step} from "openzeppelin/contracts/access/Ownable2Step.sol";
+import {Ownable, Ownable2Step} from "openzeppelin-contracts/access/Ownable2Step.sol";
 
 import {IRiscZeroVerifier, Receipt} from "./IRiscZeroVerifier.sol";
 
diff --git a/contracts/src/StructHash.sol b/contracts/src/StructHash.sol
index 6ac5417d..aa30d028 100644
--- a/contracts/src/StructHash.sol
+++ b/contracts/src/StructHash.sol
@@ -16,7 +16,7 @@
 
 pragma solidity ^0.8.9;
 
-import {SafeCast} from "openzeppelin/contracts/utils/math/SafeCast.sol";
+import {SafeCast} from "openzeppelin-contracts/utils/math/SafeCast.sol";
 
 import {reverseByteOrderUint16} from "./Util.sol";
 
diff --git a/contracts/src/config/Config.sol b/contracts/src/config/Config.sol
index fce929b3..a9851eb5 100644
--- a/contracts/src/config/Config.sol
+++ b/contracts/src/config/Config.sol
@@ -19,7 +19,7 @@ pragma solidity ^0.8.20;
 import {Vm} from "forge-std/Vm.sol";
 import {console2} from "forge-std/console2.sol";
 import {stdToml} from "forge-std/StdToml.sol";
-import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";
+import {SafeCast} from "openzeppelin-contracts/utils/math/SafeCast.sol";
 
 /// Deployment a single verifier.
 ///
diff --git a/contracts/src/groth16/RiscZeroGroth16Verifier.sol b/contracts/src/groth16/RiscZeroGroth16Verifier.sol
index fb2960a7..48553ece 100644
--- a/contracts/src/groth16/RiscZeroGroth16Verifier.sol
+++ b/contracts/src/groth16/RiscZeroGroth16Verifier.sol
@@ -17,7 +17,7 @@
 
 pragma solidity ^0.8.9;
 
-import {SafeCast} from "openzeppelin/contracts/utils/math/SafeCast.sol";
+import {SafeCast} from "openzeppelin-contracts/utils/math/SafeCast.sol";
 
 import {ControlID} from "./ControlID.sol";
 import {Groth16Verifier} from "./Groth16Verifier.sol";
diff --git a/contracts/test/RiscZeroVerifierEmergencyStop.t.sol b/contracts/test/RiscZeroVerifierEmergencyStop.t.sol
index 4e8c4fd6..9e61f920 100644
--- a/contracts/test/RiscZeroVerifierEmergencyStop.t.sol
+++ b/contracts/test/RiscZeroVerifierEmergencyStop.t.sol
@@ -18,8 +18,8 @@ pragma solidity ^0.8.13;
 
 import {Test} from "forge-std/Test.sol";
 import {console2} from "forge-std/console2.sol";
-import {Ownable} from "openzeppelin/contracts/access/Ownable.sol";
-import {Pausable} from "openzeppelin/contracts/utils/Pausable.sol";
+import {Ownable} from "openzeppelin-contracts/access/Ownable.sol";
+import {Pausable} from "openzeppelin-contracts/utils/Pausable.sol";
 
 import {
     IRiscZeroVerifier,
diff --git a/contracts/test/RiscZeroVerifierRouter.t.sol b/contracts/test/RiscZeroVerifierRouter.t.sol
index ee763eeb..b292bcad 100644
--- a/contracts/test/RiscZeroVerifierRouter.t.sol
+++ b/contracts/test/RiscZeroVerifierRouter.t.sol
@@ -18,7 +18,7 @@ pragma solidity ^0.8.13;
 
 import {Test} from "forge-std/Test.sol";
 import {console2} from "forge-std/console2.sol";
-import {Ownable} from "openzeppelin/contracts/access/Ownable.sol";
+import {Ownable} from "openzeppelin-contracts/access/Ownable.sol";
 
 import {
     IRiscZeroVerifier,