From f84bb02bc953fcab60fa244458a1a7c4f02235e3 Mon Sep 17 00:00:00 2001
From: Pro7ech <jeanphilippe.bossuat@gmail.com>
Date: Tue, 4 Nov 2025 15:55:43 +0100
Subject: [PATCH] Fix API consistency

---
 .../ciphertexts/fhe_uint_prepared.rs               | 14 +++++++-------
 poulpy-schemes/src/tfhe/bdd_arithmetic/key.rs      |  6 +++---
 .../tfhe/bdd_arithmetic/tests/test_suite/add.rs    |  8 ++++----
 .../tfhe/bdd_arithmetic/tests/test_suite/and.rs    |  8 ++++----
 .../src/tfhe/bdd_arithmetic/tests/test_suite/or.rs |  8 ++++----
 .../bdd_arithmetic/tests/test_suite/prepare.rs     |  8 ++++----
 .../tfhe/bdd_arithmetic/tests/test_suite/sll.rs    |  8 ++++----
 .../tfhe/bdd_arithmetic/tests/test_suite/slt.rs    |  8 ++++----
 .../tfhe/bdd_arithmetic/tests/test_suite/sltu.rs   |  8 ++++----
 .../tfhe/bdd_arithmetic/tests/test_suite/sra.rs    |  8 ++++----
 .../tfhe/bdd_arithmetic/tests/test_suite/srl.rs    |  8 ++++----
 .../tfhe/bdd_arithmetic/tests/test_suite/sub.rs    |  8 ++++----
 .../tfhe/bdd_arithmetic/tests/test_suite/xor.rs    |  8 ++++----
 13 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/fhe_uint_prepared.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/fhe_uint_prepared.rs
index c8036ea..f8d0ab5 100644
--- a/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/fhe_uint_prepared.rs
+++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/ciphertexts/fhe_uint_prepared.rs
@@ -23,7 +23,7 @@ pub struct FheUintPrepared<D: Data, T: UnsignedInteger, B: Backend> {
     pub(crate) _phantom: PhantomData<T>,
 }
 
-impl<T: UnsignedInteger, BE: Backend> FheUintBlocksPreparedFactory<T, BE> for Module<BE> where
+impl<T: UnsignedInteger, BE: Backend> FheUintPreparedFactory<T, BE> for Module<BE> where
     Self: Sized + GGSWPreparedFactory<BE>
 {
 }
@@ -50,7 +50,7 @@ impl<D: DataMut, T: UnsignedInteger, BE: Backend> GetGGSWBitMut<T, BE> for FheUi
     }
 }
 
-pub trait FheUintBlocksPreparedFactory<T: UnsignedInteger, BE: Backend>
+pub trait FheUintPreparedFactory<T: UnsignedInteger, BE: Backend>
 where
     Self: Sized + GGSWPreparedFactory<BE>,
 {
@@ -88,25 +88,25 @@ impl<T: UnsignedInteger, BE: Backend> FheUintPrepared<Vec<u8>, T, BE> {
     pub fn alloc_from_infos<A, M>(module: &M, infos: &A) -> Self
     where
         A: GGSWInfos,
-        M: FheUintBlocksPreparedFactory<T, BE>,
+        M: FheUintPreparedFactory<T, BE>,
     {
         module.alloc_fhe_uint_prepared_from_infos(infos)
     }
 
     pub fn alloc<M>(module: &M, base2k: Base2K, k: TorusPrecision, dnum: Dnum, dsize: Dsize, rank: Rank) -> Self
     where
-        M: FheUintBlocksPreparedFactory<T, BE>,
+        M: FheUintPreparedFactory<T, BE>,
     {
         module.alloc_fhe_uint_prepared(base2k, k, dnum, dsize, rank)
     }
 }
 
-impl<T: UnsignedInteger + ToBits, BE: Backend> FheUintBlocksPreparedEncryptSk<T, BE> for Module<BE> where
+impl<T: UnsignedInteger + ToBits, BE: Backend> FheUintPreparedEncryptSk<T, BE> for Module<BE> where
     Self: Sized + ModuleN + GGSWEncryptSk<BE> + GGSWPreparedFactory<BE>
 {
 }
 
-pub trait FheUintBlocksPreparedEncryptSk<T: UnsignedInteger + ToBits, BE: Backend>
+pub trait FheUintPreparedEncryptSk<T: UnsignedInteger + ToBits, BE: Backend>
 where
     Self: Sized + ModuleN + GGSWEncryptSk<BE> + GGSWPreparedFactory<BE>,
 {
@@ -153,7 +153,7 @@ impl<D: DataMut, T: UnsignedInteger + ToBits, BE: Backend> FheUintPrepared<D, T,
         scratch: &mut Scratch<BE>,
     ) where
         S: GLWESecretPreparedToRef<BE> + GLWEInfos,
-        M: FheUintBlocksPreparedEncryptSk<T, BE>,
+        M: FheUintPreparedEncryptSk<T, BE>,
         Scratch<BE>: ScratchTakeCore<BE>,
     {
         module.fhe_uint_prepared_encrypt_sk(self, value, sk, source_xa, source_xe, scratch);
diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/key.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/key.rs
index cc3176f..509b19f 100644
--- a/poulpy-schemes/src/tfhe/bdd_arithmetic/key.rs
+++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/key.rs
@@ -205,7 +205,7 @@ impl<D: DataMut, BRA: BlindRotationAlgo, BE: Backend> BDDKeyPrepared<D, BRA, BE>
     }
 }
 
-pub trait FheUintBlocksPrepare<BRA: BlindRotationAlgo, T: UnsignedInteger, BE: Backend> {
+pub trait FheUintPrepare<BRA: BlindRotationAlgo, T: UnsignedInteger, BE: Backend> {
     fn fhe_uint_prepare_tmp_bytes<R, A>(&self, block_size: usize, extension_factor: usize, res_infos: &R, infos: &A) -> usize
     where
         R: GGSWInfos,
@@ -223,7 +223,7 @@ pub trait FheUintBlocksPrepare<BRA: BlindRotationAlgo, T: UnsignedInteger, BE: B
         K: BDDKeyHelper<DK, BRA, BE>;
 }
 
-impl<BRA: BlindRotationAlgo, BE: Backend, T: UnsignedInteger> FheUintBlocksPrepare<BRA, T, BE> for Module<BE>
+impl<BRA: BlindRotationAlgo, BE: Backend, T: UnsignedInteger> FheUintPrepare<BRA, T, BE> for Module<BE>
 where
     Self: LWEFromGLWE<BE> + CirtuitBootstrappingExecute<BRA, BE> + GGSWPreparedFactory<BE>,
     Scratch<BE>: ScratchTakeCore<BE>,
@@ -281,7 +281,7 @@ impl<D: DataMut, T: UnsignedInteger, BE: Backend> FheUintPrepared<D, T, BE> {
         O: DataRef,
         DK: DataRef,
         K: BDDKeyHelper<DK, BRA, BE>,
-        M: FheUintBlocksPrepare<BRA, T, BE>,
+        M: FheUintPrepare<BRA, T, BE>,
         Scratch<BE>: ScratchTakeCore<BE>,
     {
         module.fhe_uint_prepare(self, other, key, scratch);
diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/add.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/add.rs
index 4cbe748..3ad0651 100644
--- a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/add.rs
+++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/add.rs
@@ -12,7 +12,7 @@ use rand::RngCore;
 use crate::tfhe::{
     bdd_arithmetic::{
         Add, BDDKeyEncryptSk, BDDKeyPrepared, BDDKeyPreparedFactory, ExecuteBDDCircuit2WTo1W, FheUint, FheUintBlockDebugPrepare,
-        FheUintBlocksPrepare, FheUintBlocksPreparedEncryptSk, FheUintBlocksPreparedFactory, FheUintPrepared,
+        FheUintPrepare, FheUintPreparedEncryptSk, FheUintPreparedFactory, FheUintPrepared,
         tests::test_suite::{TEST_GGSW_INFOS, TEST_GLWE_INFOS, TestContext},
     },
     blind_rotation::{BlindRotationAlgo, BlindRotationKey, BlindRotationKeyFactory},
@@ -24,13 +24,13 @@ where
         + GLWESecretPreparedFactory<BE>
         + GLWEDecrypt<BE>
         + GLWENoise<BE>
-        + FheUintBlocksPreparedFactory<u32, BE>
-        + FheUintBlocksPreparedEncryptSk<u32, BE>
+        + FheUintPreparedFactory<u32, BE>
+        + FheUintPreparedEncryptSk<u32, BE>
         + FheUintBlockDebugPrepare<BRA, u32, BE>
         + BDDKeyEncryptSk<BRA, BE>
         + BDDKeyPreparedFactory<BRA, BE>
         + GGSWNoise<BE>
-        + FheUintBlocksPrepare<BRA, u32, BE>
+        + FheUintPrepare<BRA, u32, BE>
         + ExecuteBDDCircuit2WTo1W<u32, BE>
         + GLWEEncryptSk<BE>,
     BlindRotationKey<Vec<u8>, BRA>: BlindRotationKeyFactory<BRA>,
diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/and.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/and.rs
index bf7e720..5ed7471 100644
--- a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/and.rs
+++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/and.rs
@@ -12,7 +12,7 @@ use rand::RngCore;
 use crate::tfhe::{
     bdd_arithmetic::{
         And, BDDKeyEncryptSk, BDDKeyPrepared, BDDKeyPreparedFactory, ExecuteBDDCircuit2WTo1W, FheUint, FheUintBlockDebugPrepare,
-        FheUintBlocksPrepare, FheUintBlocksPreparedEncryptSk, FheUintBlocksPreparedFactory, FheUintPrepared,
+        FheUintPrepare, FheUintPreparedEncryptSk, FheUintPreparedFactory, FheUintPrepared,
         tests::test_suite::{TEST_GGSW_INFOS, TEST_GLWE_INFOS, TestContext},
     },
     blind_rotation::{BlindRotationAlgo, BlindRotationKey, BlindRotationKeyFactory},
@@ -24,13 +24,13 @@ where
         + GLWESecretPreparedFactory<BE>
         + GLWEDecrypt<BE>
         + GLWENoise<BE>
-        + FheUintBlocksPreparedFactory<u32, BE>
-        + FheUintBlocksPreparedEncryptSk<u32, BE>
+        + FheUintPreparedFactory<u32, BE>
+        + FheUintPreparedEncryptSk<u32, BE>
         + FheUintBlockDebugPrepare<BRA, u32, BE>
         + BDDKeyEncryptSk<BRA, BE>
         + BDDKeyPreparedFactory<BRA, BE>
         + GGSWNoise<BE>
-        + FheUintBlocksPrepare<BRA, u32, BE>
+        + FheUintPrepare<BRA, u32, BE>
         + ExecuteBDDCircuit2WTo1W<u32, BE>
         + GLWEEncryptSk<BE>,
     BlindRotationKey<Vec<u8>, BRA>: BlindRotationKeyFactory<BRA>,
diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/or.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/or.rs
index e1ff2f2..53f6d2d 100644
--- a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/or.rs
+++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/or.rs
@@ -12,7 +12,7 @@ use rand::RngCore;
 use crate::tfhe::{
     bdd_arithmetic::{
         BDDKeyEncryptSk, BDDKeyPrepared, BDDKeyPreparedFactory, ExecuteBDDCircuit2WTo1W, FheUint, FheUintBlockDebugPrepare,
-        FheUintBlocksPrepare, FheUintBlocksPreparedEncryptSk, FheUintBlocksPreparedFactory, FheUintPrepared, Or,
+        FheUintPrepare, FheUintPreparedEncryptSk, FheUintPreparedFactory, FheUintPrepared, Or,
         tests::test_suite::{TEST_GGSW_INFOS, TEST_GLWE_INFOS, TestContext},
     },
     blind_rotation::{BlindRotationAlgo, BlindRotationKey, BlindRotationKeyFactory},
@@ -24,13 +24,13 @@ where
         + GLWESecretPreparedFactory<BE>
         + GLWEDecrypt<BE>
         + GLWENoise<BE>
-        + FheUintBlocksPreparedFactory<u32, BE>
-        + FheUintBlocksPreparedEncryptSk<u32, BE>
+        + FheUintPreparedFactory<u32, BE>
+        + FheUintPreparedEncryptSk<u32, BE>
         + FheUintBlockDebugPrepare<BRA, u32, BE>
         + BDDKeyEncryptSk<BRA, BE>
         + BDDKeyPreparedFactory<BRA, BE>
         + GGSWNoise<BE>
-        + FheUintBlocksPrepare<BRA, u32, BE>
+        + FheUintPrepare<BRA, u32, BE>
         + ExecuteBDDCircuit2WTo1W<u32, BE>
         + GLWEEncryptSk<BE>,
     BlindRotationKey<Vec<u8>, BRA>: BlindRotationKeyFactory<BRA>,
diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/prepare.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/prepare.rs
index acc82de..d930f40 100644
--- a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/prepare.rs
+++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/prepare.rs
@@ -12,7 +12,7 @@ use rand::RngCore;
 use crate::tfhe::{
     bdd_arithmetic::{
         BDDKeyEncryptSk, BDDKeyPrepared, BDDKeyPreparedFactory, ExecuteBDDCircuit2WTo1W, FheUint, FheUintBlockDebugPrepare,
-        FheUintBlocksPrepare, FheUintBlocksPreparedEncryptSk, FheUintBlocksPreparedFactory, FheUintPreparedDebug,
+        FheUintPrepare, FheUintPreparedEncryptSk, FheUintPreparedFactory, FheUintPreparedDebug,
         tests::test_suite::{TEST_BASE2K, TEST_GGSW_INFOS, TEST_GLWE_INFOS, TestContext},
     },
     blind_rotation::{BlindRotationAlgo, BlindRotationKey, BlindRotationKeyFactory},
@@ -24,13 +24,13 @@ where
         + GLWESecretPreparedFactory<BE>
         + GLWEDecrypt<BE>
         + GLWENoise<BE>
-        + FheUintBlocksPreparedFactory<u32, BE>
-        + FheUintBlocksPreparedEncryptSk<u32, BE>
+        + FheUintPreparedFactory<u32, BE>
+        + FheUintPreparedEncryptSk<u32, BE>
         + FheUintBlockDebugPrepare<BRA, u32, BE>
         + BDDKeyEncryptSk<BRA, BE>
         + BDDKeyPreparedFactory<BRA, BE>
         + GGSWNoise<BE>
-        + FheUintBlocksPrepare<BRA, u32, BE>
+        + FheUintPrepare<BRA, u32, BE>
         + ExecuteBDDCircuit2WTo1W<u32, BE>
         + GLWEEncryptSk<BE>,
     BlindRotationKey<Vec<u8>, BRA>: BlindRotationKeyFactory<BRA>,
diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sll.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sll.rs
index 987c9fb..14a7205 100644
--- a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sll.rs
+++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sll.rs
@@ -12,7 +12,7 @@ use rand::RngCore;
 use crate::tfhe::{
     bdd_arithmetic::{
         BDDKeyEncryptSk, BDDKeyPrepared, BDDKeyPreparedFactory, ExecuteBDDCircuit2WTo1W, FheUint, FheUintBlockDebugPrepare,
-        FheUintBlocksPrepare, FheUintBlocksPreparedEncryptSk, FheUintBlocksPreparedFactory, FheUintPrepared, Sll,
+        FheUintPrepare, FheUintPreparedEncryptSk, FheUintPreparedFactory, FheUintPrepared, Sll,
         tests::test_suite::{TEST_GGSW_INFOS, TEST_GLWE_INFOS, TestContext},
     },
     blind_rotation::{BlindRotationAlgo, BlindRotationKey, BlindRotationKeyFactory},
@@ -24,13 +24,13 @@ where
         + GLWESecretPreparedFactory<BE>
         + GLWEDecrypt<BE>
         + GLWENoise<BE>
-        + FheUintBlocksPreparedFactory<u32, BE>
-        + FheUintBlocksPreparedEncryptSk<u32, BE>
+        + FheUintPreparedFactory<u32, BE>
+        + FheUintPreparedEncryptSk<u32, BE>
         + FheUintBlockDebugPrepare<BRA, u32, BE>
         + BDDKeyEncryptSk<BRA, BE>
         + BDDKeyPreparedFactory<BRA, BE>
         + GGSWNoise<BE>
-        + FheUintBlocksPrepare<BRA, u32, BE>
+        + FheUintPrepare<BRA, u32, BE>
         + ExecuteBDDCircuit2WTo1W<u32, BE>
         + GLWEEncryptSk<BE>,
     BlindRotationKey<Vec<u8>, BRA>: BlindRotationKeyFactory<BRA>,
diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/slt.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/slt.rs
index bab9bfe..87d8235 100644
--- a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/slt.rs
+++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/slt.rs
@@ -12,7 +12,7 @@ use rand::RngCore;
 use crate::tfhe::{
     bdd_arithmetic::{
         BDDKeyEncryptSk, BDDKeyPrepared, BDDKeyPreparedFactory, ExecuteBDDCircuit2WTo1W, FheUint, FheUintBlockDebugPrepare,
-        FheUintBlocksPrepare, FheUintBlocksPreparedEncryptSk, FheUintBlocksPreparedFactory, FheUintPrepared, Slt,
+        FheUintPrepare, FheUintPreparedEncryptSk, FheUintPreparedFactory, FheUintPrepared, Slt,
         tests::test_suite::{TEST_GGSW_INFOS, TEST_GLWE_INFOS, TestContext},
     },
     blind_rotation::{BlindRotationAlgo, BlindRotationKey, BlindRotationKeyFactory},
@@ -24,13 +24,13 @@ where
         + GLWESecretPreparedFactory<BE>
         + GLWEDecrypt<BE>
         + GLWENoise<BE>
-        + FheUintBlocksPreparedFactory<u32, BE>
-        + FheUintBlocksPreparedEncryptSk<u32, BE>
+        + FheUintPreparedFactory<u32, BE>
+        + FheUintPreparedEncryptSk<u32, BE>
         + FheUintBlockDebugPrepare<BRA, u32, BE>
         + BDDKeyEncryptSk<BRA, BE>
         + BDDKeyPreparedFactory<BRA, BE>
         + GGSWNoise<BE>
-        + FheUintBlocksPrepare<BRA, u32, BE>
+        + FheUintPrepare<BRA, u32, BE>
         + ExecuteBDDCircuit2WTo1W<u32, BE>
         + GLWEEncryptSk<BE>,
     BlindRotationKey<Vec<u8>, BRA>: BlindRotationKeyFactory<BRA>,
diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sltu.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sltu.rs
index 8b7bb7f..19ff2c2 100644
--- a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sltu.rs
+++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sltu.rs
@@ -12,7 +12,7 @@ use rand::RngCore;
 use crate::tfhe::{
     bdd_arithmetic::{
         BDDKeyEncryptSk, BDDKeyPrepared, BDDKeyPreparedFactory, ExecuteBDDCircuit2WTo1W, FheUint, FheUintBlockDebugPrepare,
-        FheUintBlocksPrepare, FheUintBlocksPreparedEncryptSk, FheUintBlocksPreparedFactory, FheUintPrepared, Sltu,
+        FheUintPrepare, FheUintPreparedEncryptSk, FheUintPreparedFactory, FheUintPrepared, Sltu,
         tests::test_suite::{TEST_GGSW_INFOS, TEST_GLWE_INFOS, TestContext},
     },
     blind_rotation::{BlindRotationAlgo, BlindRotationKey, BlindRotationKeyFactory},
@@ -24,13 +24,13 @@ where
         + GLWESecretPreparedFactory<BE>
         + GLWEDecrypt<BE>
         + GLWENoise<BE>
-        + FheUintBlocksPreparedFactory<u32, BE>
-        + FheUintBlocksPreparedEncryptSk<u32, BE>
+        + FheUintPreparedFactory<u32, BE>
+        + FheUintPreparedEncryptSk<u32, BE>
         + FheUintBlockDebugPrepare<BRA, u32, BE>
         + BDDKeyEncryptSk<BRA, BE>
         + BDDKeyPreparedFactory<BRA, BE>
         + GGSWNoise<BE>
-        + FheUintBlocksPrepare<BRA, u32, BE>
+        + FheUintPrepare<BRA, u32, BE>
         + ExecuteBDDCircuit2WTo1W<u32, BE>
         + GLWEEncryptSk<BE>,
     BlindRotationKey<Vec<u8>, BRA>: BlindRotationKeyFactory<BRA>,
diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sra.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sra.rs
index 5cfb757..79cf96b 100644
--- a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sra.rs
+++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sra.rs
@@ -12,7 +12,7 @@ use rand::RngCore;
 use crate::tfhe::{
     bdd_arithmetic::{
         BDDKeyEncryptSk, BDDKeyPrepared, BDDKeyPreparedFactory, ExecuteBDDCircuit2WTo1W, FheUint, FheUintBlockDebugPrepare,
-        FheUintBlocksPrepare, FheUintBlocksPreparedEncryptSk, FheUintBlocksPreparedFactory, FheUintPrepared, Sra,
+        FheUintPrepare, FheUintPreparedEncryptSk, FheUintPreparedFactory, FheUintPrepared, Sra,
         tests::test_suite::{TEST_GGSW_INFOS, TEST_GLWE_INFOS, TestContext},
     },
     blind_rotation::{BlindRotationAlgo, BlindRotationKey, BlindRotationKeyFactory},
@@ -24,13 +24,13 @@ where
         + GLWESecretPreparedFactory<BE>
         + GLWEDecrypt<BE>
         + GLWENoise<BE>
-        + FheUintBlocksPreparedFactory<u32, BE>
-        + FheUintBlocksPreparedEncryptSk<u32, BE>
+        + FheUintPreparedFactory<u32, BE>
+        + FheUintPreparedEncryptSk<u32, BE>
         + FheUintBlockDebugPrepare<BRA, u32, BE>
         + BDDKeyEncryptSk<BRA, BE>
         + BDDKeyPreparedFactory<BRA, BE>
         + GGSWNoise<BE>
-        + FheUintBlocksPrepare<BRA, u32, BE>
+        + FheUintPrepare<BRA, u32, BE>
         + ExecuteBDDCircuit2WTo1W<u32, BE>
         + GLWEEncryptSk<BE>,
     BlindRotationKey<Vec<u8>, BRA>: BlindRotationKeyFactory<BRA>,
diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/srl.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/srl.rs
index adc5e0d..49429df 100644
--- a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/srl.rs
+++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/srl.rs
@@ -12,7 +12,7 @@ use rand::RngCore;
 use crate::tfhe::{
     bdd_arithmetic::{
         BDDKeyEncryptSk, BDDKeyPrepared, BDDKeyPreparedFactory, ExecuteBDDCircuit2WTo1W, FheUint, FheUintBlockDebugPrepare,
-        FheUintBlocksPrepare, FheUintBlocksPreparedEncryptSk, FheUintBlocksPreparedFactory, FheUintPrepared, Srl,
+        FheUintPrepare, FheUintPreparedEncryptSk, FheUintPreparedFactory, FheUintPrepared, Srl,
         tests::test_suite::{TEST_GGSW_INFOS, TEST_GLWE_INFOS, TestContext},
     },
     blind_rotation::{BlindRotationAlgo, BlindRotationKey, BlindRotationKeyFactory},
@@ -24,13 +24,13 @@ where
         + GLWESecretPreparedFactory<BE>
         + GLWEDecrypt<BE>
         + GLWENoise<BE>
-        + FheUintBlocksPreparedFactory<u32, BE>
-        + FheUintBlocksPreparedEncryptSk<u32, BE>
+        + FheUintPreparedFactory<u32, BE>
+        + FheUintPreparedEncryptSk<u32, BE>
         + FheUintBlockDebugPrepare<BRA, u32, BE>
         + BDDKeyEncryptSk<BRA, BE>
         + BDDKeyPreparedFactory<BRA, BE>
         + GGSWNoise<BE>
-        + FheUintBlocksPrepare<BRA, u32, BE>
+        + FheUintPrepare<BRA, u32, BE>
         + ExecuteBDDCircuit2WTo1W<u32, BE>
         + GLWEEncryptSk<BE>,
     BlindRotationKey<Vec<u8>, BRA>: BlindRotationKeyFactory<BRA>,
diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sub.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sub.rs
index 2ee4cba..f5eea39 100644
--- a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sub.rs
+++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/sub.rs
@@ -12,7 +12,7 @@ use rand::RngCore;
 use crate::tfhe::{
     bdd_arithmetic::{
         BDDKeyEncryptSk, BDDKeyPrepared, BDDKeyPreparedFactory, ExecuteBDDCircuit2WTo1W, FheUint, FheUintBlockDebugPrepare,
-        FheUintBlocksPrepare, FheUintBlocksPreparedEncryptSk, FheUintBlocksPreparedFactory, FheUintPrepared, Sub,
+        FheUintPrepare, FheUintPreparedEncryptSk, FheUintPreparedFactory, FheUintPrepared, Sub,
         tests::test_suite::{TEST_GGSW_INFOS, TEST_GLWE_INFOS, TestContext},
     },
     blind_rotation::{BlindRotationAlgo, BlindRotationKey, BlindRotationKeyFactory},
@@ -24,13 +24,13 @@ where
         + GLWESecretPreparedFactory<BE>
         + GLWEDecrypt<BE>
         + GLWENoise<BE>
-        + FheUintBlocksPreparedFactory<u32, BE>
-        + FheUintBlocksPreparedEncryptSk<u32, BE>
+        + FheUintPreparedFactory<u32, BE>
+        + FheUintPreparedEncryptSk<u32, BE>
         + FheUintBlockDebugPrepare<BRA, u32, BE>
         + BDDKeyEncryptSk<BRA, BE>
         + BDDKeyPreparedFactory<BRA, BE>
         + GGSWNoise<BE>
-        + FheUintBlocksPrepare<BRA, u32, BE>
+        + FheUintPrepare<BRA, u32, BE>
         + ExecuteBDDCircuit2WTo1W<u32, BE>
         + GLWEEncryptSk<BE>,
     BlindRotationKey<Vec<u8>, BRA>: BlindRotationKeyFactory<BRA>,
diff --git a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/xor.rs b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/xor.rs
index 0edaae4..c09f3bf 100644
--- a/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/xor.rs
+++ b/poulpy-schemes/src/tfhe/bdd_arithmetic/tests/test_suite/xor.rs
@@ -12,7 +12,7 @@ use rand::RngCore;
 use crate::tfhe::{
     bdd_arithmetic::{
         BDDKeyEncryptSk, BDDKeyPrepared, BDDKeyPreparedFactory, ExecuteBDDCircuit2WTo1W, FheUint, FheUintBlockDebugPrepare,
-        FheUintBlocksPrepare, FheUintBlocksPreparedEncryptSk, FheUintBlocksPreparedFactory, FheUintPrepared, Xor,
+        FheUintPrepare, FheUintPreparedEncryptSk, FheUintPreparedFactory, FheUintPrepared, Xor,
         tests::test_suite::{TEST_GGSW_INFOS, TEST_GLWE_INFOS, TestContext},
     },
     blind_rotation::{BlindRotationAlgo, BlindRotationKey, BlindRotationKeyFactory},
@@ -24,13 +24,13 @@ where
         + GLWESecretPreparedFactory<BE>
         + GLWEDecrypt<BE>
         + GLWENoise<BE>
-        + FheUintBlocksPreparedFactory<u32, BE>
-        + FheUintBlocksPreparedEncryptSk<u32, BE>
+        + FheUintPreparedFactory<u32, BE>
+        + FheUintPreparedEncryptSk<u32, BE>
         + FheUintBlockDebugPrepare<BRA, u32, BE>
         + BDDKeyEncryptSk<BRA, BE>
         + BDDKeyPreparedFactory<BRA, BE>
         + GGSWNoise<BE>
-        + FheUintBlocksPrepare<BRA, u32, BE>
+        + FheUintPrepare<BRA, u32, BE>
         + ExecuteBDDCircuit2WTo1W<u32, BE>
         + GLWEEncryptSk<BE>,
     BlindRotationKey<Vec<u8>, BRA>: BlindRotationKeyFactory<BRA>,