diff --git a/zk-token-sdk/src/instruction/ctxt_ctxt_equality.rs b/zk-token-sdk/src/instruction/ciphertext_ciphertext_equality.rs
similarity index 98%
rename from zk-token-sdk/src/instruction/ctxt_ctxt_equality.rs
rename to zk-token-sdk/src/instruction/ciphertext_ciphertext_equality.rs
index de2e8e07d..200d2845d 100644
--- a/zk-token-sdk/src/instruction/ctxt_ctxt_equality.rs
+++ b/zk-token-sdk/src/instruction/ciphertext_ciphertext_equality.rs
@@ -16,7 +16,7 @@ use {
             pedersen::PedersenOpening,
         },
         errors::ProofError,
-        sigma_proofs::ctxt_ctxt_equality_proof::CiphertextCiphertextEqualityProof,
+        sigma_proofs::ciphertext_ciphertext_equality_proof::CiphertextCiphertextEqualityProof,
         transcript::TranscriptProtocol,
     },
     merlin::Transcript,
diff --git a/zk-token-sdk/src/instruction/ciphertext_commitment_equality.rs b/zk-token-sdk/src/instruction/ciphertext_commitment_equality.rs
index c62eb53b6..2f03d9517 100644
--- a/zk-token-sdk/src/instruction/ciphertext_commitment_equality.rs
+++ b/zk-token-sdk/src/instruction/ciphertext_commitment_equality.rs
@@ -13,7 +13,7 @@ use {
             pedersen::{PedersenCommitment, PedersenOpening},
         },
         errors::ProofError,
-        sigma_proofs::ctxt_comm_equality_proof::CiphertextCommitmentEqualityProof,
+        sigma_proofs::ciphertext_commitment_equality_proof::CiphertextCommitmentEqualityProof,
         transcript::TranscriptProtocol,
     },
     merlin::Transcript,
diff --git a/zk-token-sdk/src/instruction/mod.rs b/zk-token-sdk/src/instruction/mod.rs
index 6f4a74ab0..d1abe9354 100644
--- a/zk-token-sdk/src/instruction/mod.rs
+++ b/zk-token-sdk/src/instruction/mod.rs
@@ -1,6 +1,6 @@
 pub mod batched_range_proof;
+pub mod ciphertext_ciphertext_equality;
 pub mod ciphertext_commitment_equality;
-pub mod ctxt_ctxt_equality;
 pub mod pubkey_validity;
 pub mod range_proof;
 pub mod transfer;
@@ -27,12 +27,12 @@ pub use {
         batched_range_proof_u64::BatchedRangeProofU64Data, BatchedRangeProofContext,
     },
     bytemuck::Pod,
+    ciphertext_ciphertext_equality::{
+        CiphertextCiphertextEqualityProofContext, CiphertextCiphertextEqualityProofData,
+    },
     ciphertext_commitment_equality::{
         CiphertextCommitmentEqualityProofContext, CiphertextCommitmentEqualityProofData,
     },
-    ctxt_ctxt_equality::{
-        CiphertextCiphertextEqualityProofContext, CiphertextCiphertextEqualityProofData,
-    },
     pubkey_validity::{PubkeyValidityData, PubkeyValidityProofContext},
     range_proof::{RangeProofContext, RangeProofU64Data},
     transfer::{TransferData, TransferProofContext},
diff --git a/zk-token-sdk/src/instruction/transfer.rs b/zk-token-sdk/src/instruction/transfer.rs
index a153b6b30..16395dbfb 100644
--- a/zk-token-sdk/src/instruction/transfer.rs
+++ b/zk-token-sdk/src/instruction/transfer.rs
@@ -11,7 +11,7 @@ use {
         instruction::{combine_lo_hi_ciphertexts, split_u64, Role},
         range_proof::RangeProof,
         sigma_proofs::{
-            ctxt_comm_equality_proof::CiphertextCommitmentEqualityProof,
+            ciphertext_commitment_equality_proof::CiphertextCommitmentEqualityProof,
             validity_proof::AggregatedValidityProof,
         },
         transcript::TranscriptProtocol,
diff --git a/zk-token-sdk/src/instruction/transfer_with_fee.rs b/zk-token-sdk/src/instruction/transfer_with_fee.rs
index 213d9356f..b0f1c308a 100644
--- a/zk-token-sdk/src/instruction/transfer_with_fee.rs
+++ b/zk-token-sdk/src/instruction/transfer_with_fee.rs
@@ -14,8 +14,8 @@ use {
         },
         range_proof::RangeProof,
         sigma_proofs::{
-            ctxt_comm_equality_proof::CiphertextCommitmentEqualityProof, fee_proof::FeeSigmaProof,
-            validity_proof::AggregatedValidityProof,
+            ciphertext_commitment_equality_proof::CiphertextCommitmentEqualityProof,
+            fee_proof::FeeSigmaProof, validity_proof::AggregatedValidityProof,
         },
         transcript::TranscriptProtocol,
     },
diff --git a/zk-token-sdk/src/instruction/withdraw.rs b/zk-token-sdk/src/instruction/withdraw.rs
index 2ddd1462b..42dd90a67 100644
--- a/zk-token-sdk/src/instruction/withdraw.rs
+++ b/zk-token-sdk/src/instruction/withdraw.rs
@@ -7,7 +7,7 @@ use {
         },
         errors::ProofError,
         range_proof::RangeProof,
-        sigma_proofs::ctxt_comm_equality_proof::CiphertextCommitmentEqualityProof,
+        sigma_proofs::ciphertext_commitment_equality_proof::CiphertextCommitmentEqualityProof,
         transcript::TranscriptProtocol,
     },
     merlin::Transcript,
diff --git a/zk-token-sdk/src/sigma_proofs/ctxt_ctxt_equality_proof.rs b/zk-token-sdk/src/sigma_proofs/ciphertext_ciphertext_equality_proof.rs
similarity index 100%
rename from zk-token-sdk/src/sigma_proofs/ctxt_ctxt_equality_proof.rs
rename to zk-token-sdk/src/sigma_proofs/ciphertext_ciphertext_equality_proof.rs
diff --git a/zk-token-sdk/src/sigma_proofs/ctxt_comm_equality_proof.rs b/zk-token-sdk/src/sigma_proofs/ciphertext_commitment_equality_proof.rs
similarity index 100%
rename from zk-token-sdk/src/sigma_proofs/ctxt_comm_equality_proof.rs
rename to zk-token-sdk/src/sigma_proofs/ciphertext_commitment_equality_proof.rs
diff --git a/zk-token-sdk/src/sigma_proofs/mod.rs b/zk-token-sdk/src/sigma_proofs/mod.rs
index 2ccf2fdf3..587961ca7 100644
--- a/zk-token-sdk/src/sigma_proofs/mod.rs
+++ b/zk-token-sdk/src/sigma_proofs/mod.rs
@@ -15,8 +15,8 @@
 //! We refer to the zk-token paper for the formal details and security proofs of these argument
 //! systems.
 
-pub mod ctxt_comm_equality_proof;
-pub mod ctxt_ctxt_equality_proof;
+pub mod ciphertext_ciphertext_equality_proof;
+pub mod ciphertext_commitment_equality_proof;
 pub mod errors;
 pub mod fee_proof;
 pub mod pubkey_proof;
diff --git a/zk-token-sdk/src/zk_token_elgamal/convert.rs b/zk-token-sdk/src/zk_token_elgamal/convert.rs
index 00a582be2..dbe2c83c6 100644
--- a/zk-token-sdk/src/zk_token_elgamal/convert.rs
+++ b/zk-token-sdk/src/zk_token_elgamal/convert.rs
@@ -64,8 +64,8 @@ mod target_arch {
             },
             range_proof::{errors::RangeProofError, RangeProof},
             sigma_proofs::{
-                ctxt_comm_equality_proof::CiphertextCommitmentEqualityProof,
-                ctxt_ctxt_equality_proof::CiphertextCiphertextEqualityProof,
+                ciphertext_ciphertext_equality_proof::CiphertextCiphertextEqualityProof,
+                ciphertext_commitment_equality_proof::CiphertextCommitmentEqualityProof,
                 errors::*,
                 fee_proof::FeeSigmaProof,
                 pubkey_proof::PubkeyValidityProof,