diff --git a/contracts/script/deploy/v1.0.1/SP1Verifier.s.sol b/contracts/script/deploy/v1.0.1/SP1Verifier.s.sol
index 8cebfd8..d340469 100644
--- a/contracts/script/deploy/v1.0.1/SP1Verifier.s.sol
+++ b/contracts/script/deploy/v1.0.1/SP1Verifier.s.sol
@@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript {
     function run() external multichain(KEY) broadcaster {
         // Read config
         bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT");
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
 
         // Deploy contract
         address verifier = address(new SP1Verifier{salt: CREATE2_SALT}());
@@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript {
 
     function freeze() external multichain(KEY) broadcaster {
         // Read config
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
         address SP1_VERIFIER = readAddress(KEY);
 
         // Freeze the verifier on the gateway
diff --git a/contracts/script/deploy/v1.0.7-testnet/SP1Verifier.s.sol b/contracts/script/deploy/v1.0.7-testnet/SP1Verifier.s.sol
index 5f43674..c833e39 100644
--- a/contracts/script/deploy/v1.0.7-testnet/SP1Verifier.s.sol
+++ b/contracts/script/deploy/v1.0.7-testnet/SP1Verifier.s.sol
@@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript {
     function run() external multichain(KEY) broadcaster {
         // Read config
         bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT");
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
 
         // Deploy contract
         address verifier = address(new SP1Verifier{salt: CREATE2_SALT}());
@@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript {
 
     function freeze() external multichain(KEY) broadcaster {
         // Read config
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
         address SP1_VERIFIER = readAddress(KEY);
 
         // Freeze the verifier on the gateway
diff --git a/contracts/script/deploy/v1.0.8-testnet/SP1Verifier.s.sol b/contracts/script/deploy/v1.0.8-testnet/SP1Verifier.s.sol
index 2e547f3..5a6b3cf 100644
--- a/contracts/script/deploy/v1.0.8-testnet/SP1Verifier.s.sol
+++ b/contracts/script/deploy/v1.0.8-testnet/SP1Verifier.s.sol
@@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript {
     function run() external multichain(KEY) broadcaster {
         // Read config
         bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT");
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
 
         // Deploy contract
         address verifier = address(new SP1Verifier{salt: CREATE2_SALT}());
@@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript {
 
     function freeze() external multichain(KEY) broadcaster {
         // Read config
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
         address SP1_VERIFIER = readAddress(KEY);
 
         // Freeze the verifier on the gateway
diff --git a/contracts/script/deploy/v1.1.0/SP1Verifier.s.sol b/contracts/script/deploy/v1.1.0/SP1Verifier.s.sol
index c2671c6..18e0f0a 100644
--- a/contracts/script/deploy/v1.1.0/SP1Verifier.s.sol
+++ b/contracts/script/deploy/v1.1.0/SP1Verifier.s.sol
@@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript {
     function run() external multichain(KEY) broadcaster {
         // Read config
         bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT");
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
 
         // Deploy contract
         address verifier = address(new SP1Verifier{salt: CREATE2_SALT}());
@@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript {
 
     function freeze() external multichain(KEY) broadcaster {
         // Read config
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
         address SP1_VERIFIER = readAddress(KEY);
 
         // Freeze the verifier on the gateway
diff --git a/contracts/script/deploy/v1.2.0-rc1/SP1VerifierGroth16.s.sol b/contracts/script/deploy/v1.2.0-rc1/SP1VerifierGroth16.s.sol
index 5fd7793..160106a 100644
--- a/contracts/script/deploy/v1.2.0-rc1/SP1VerifierGroth16.s.sol
+++ b/contracts/script/deploy/v1.2.0-rc1/SP1VerifierGroth16.s.sol
@@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript {
     function run() external multichain(KEY) broadcaster {
         // Read config
         bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT");
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16");
 
         // Deploy contract
         address verifier = address(new SP1Verifier{salt: CREATE2_SALT}());
diff --git a/contracts/script/deploy/v1.2.0/SP1VerifierGroth16.s.sol b/contracts/script/deploy/v1.2.0/SP1VerifierGroth16.s.sol
index 3bf4e71..93b32aa 100644
--- a/contracts/script/deploy/v1.2.0/SP1VerifierGroth16.s.sol
+++ b/contracts/script/deploy/v1.2.0/SP1VerifierGroth16.s.sol
@@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript {
     function run() external multichain(KEY) broadcaster {
         // Read config
         bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT");
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16");
 
         // Deploy contract
         address verifier = address(new SP1Verifier{salt: CREATE2_SALT}());
diff --git a/contracts/script/deploy/v2.0.0/SP1VerifierGroth16.s.sol b/contracts/script/deploy/v2.0.0/SP1VerifierGroth16.s.sol
index 7493d64..9f82916 100644
--- a/contracts/script/deploy/v2.0.0/SP1VerifierGroth16.s.sol
+++ b/contracts/script/deploy/v2.0.0/SP1VerifierGroth16.s.sol
@@ -7,7 +7,7 @@ import {SP1VerifierGateway} from "../../../src/SP1VerifierGateway.sol";
 import {ISP1VerifierWithHash} from "../../../src/ISP1Verifier.sol";
 
 contract SP1VerifierScript is BaseScript {
-    string internal constant KEY = "V2_0_0_SP1_VERIFIER_GROTH16";
+    string internal constant KEY = "V2_0_0_SP1_VERIFIER_PLONK";
 
     function run() external multichain(KEY) broadcaster {
         // Read config
@@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript {
 
     function freeze() external multichain(KEY) broadcaster {
         // Read config
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
         address SP1_VERIFIER = readAddress(KEY);
 
         // Freeze the verifier on the gateway
diff --git a/contracts/script/deploy/v3.0.0-rc1/SP1VerifierGroth16.s.sol b/contracts/script/deploy/v3.0.0-rc1/SP1VerifierGroth16.s.sol
index 78cecef..3586347 100644
--- a/contracts/script/deploy/v3.0.0-rc1/SP1VerifierGroth16.s.sol
+++ b/contracts/script/deploy/v3.0.0-rc1/SP1VerifierGroth16.s.sol
@@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript {
     function run() external multichain(KEY) broadcaster {
         // Read config
         bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT");
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16");
 
         // Deploy contract
         address verifier = address(new SP1Verifier{salt: CREATE2_SALT}());
diff --git a/contracts/script/deploy/v3.0.0-rc1/SP1VerifierPlonk.s.sol b/contracts/script/deploy/v3.0.0-rc1/SP1VerifierPlonk.s.sol
index 76f3312..40f8cb6 100644
--- a/contracts/script/deploy/v3.0.0-rc1/SP1VerifierPlonk.s.sol
+++ b/contracts/script/deploy/v3.0.0-rc1/SP1VerifierPlonk.s.sol
@@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript {
     function run() external multichain(KEY) broadcaster {
         // Read config
         bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT");
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
 
         // Deploy contract
         address verifier = address(new SP1Verifier{salt: CREATE2_SALT}());
@@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript {
 
     function freeze() external multichain(KEY) broadcaster {
         // Read config
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
         address SP1_VERIFIER = readAddress(KEY);
 
         // Freeze the verifier on the gateway
diff --git a/contracts/script/deploy/v3.0.0-rc3/SP1VerifierGroth16.s.sol b/contracts/script/deploy/v3.0.0-rc3/SP1VerifierGroth16.s.sol
index 804d06e..79c93cb 100644
--- a/contracts/script/deploy/v3.0.0-rc3/SP1VerifierGroth16.s.sol
+++ b/contracts/script/deploy/v3.0.0-rc3/SP1VerifierGroth16.s.sol
@@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript {
     function run() external multichain(KEY) broadcaster {
         // Read config
         bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT");
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16");
 
         // Deploy contract
         address verifier = address(new SP1Verifier{salt: CREATE2_SALT}());
diff --git a/contracts/script/deploy/v3.0.0-rc4/SP1VerifierGroth16.s.sol b/contracts/script/deploy/v3.0.0-rc4/SP1VerifierGroth16.s.sol
index 7829db3..6a84bfc 100644
--- a/contracts/script/deploy/v3.0.0-rc4/SP1VerifierGroth16.s.sol
+++ b/contracts/script/deploy/v3.0.0-rc4/SP1VerifierGroth16.s.sol
@@ -12,7 +12,7 @@ contract SP1VerifierScript is BaseScript {
     function run() external multichain(KEY) broadcaster {
         // Read config
         bytes32 CREATE2_SALT = readBytes32("CREATE2_SALT");
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16");
 
         // Deploy contract
         address verifier = address(new SP1Verifier{salt: CREATE2_SALT}());
diff --git a/contracts/script/deploy/v3.0.0/SP1VerifierGroth16.s.sol b/contracts/script/deploy/v3.0.0/SP1VerifierGroth16.s.sol
index fdcabc3..7763f49 100644
--- a/contracts/script/deploy/v3.0.0/SP1VerifierGroth16.s.sol
+++ b/contracts/script/deploy/v3.0.0/SP1VerifierGroth16.s.sol
@@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript {
 
     function freeze() external multichain(KEY) broadcaster {
         // Read config
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_GROTH16");
         address SP1_VERIFIER = readAddress(KEY);
 
         // Freeze the verifier on the gateway
diff --git a/contracts/script/deploy/v3.0.0/SP1VerifierPlonk.s.sol b/contracts/script/deploy/v3.0.0/SP1VerifierPlonk.s.sol
index a090282..60aa43c 100644
--- a/contracts/script/deploy/v3.0.0/SP1VerifierPlonk.s.sol
+++ b/contracts/script/deploy/v3.0.0/SP1VerifierPlonk.s.sol
@@ -27,7 +27,7 @@ contract SP1VerifierScript is BaseScript {
 
     function freeze() external multichain(KEY) broadcaster {
         // Read config
-        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY");
+        address SP1_VERIFIER_GATEWAY = readAddress("SP1_VERIFIER_GATEWAY_PLONK");
         address SP1_VERIFIER = readAddress(KEY);
 
         // Freeze the verifier on the gateway