@@ -1,5 +1,5 @@
 use poulpy_core::layouts::{
-    Base2K, Dnum, Dsize, GGSW, GGSWLayout, GLWE, GLWELayout, GLWESecret, Rank, RingDegree, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGSW, GGSWLayout, GLWE, GLWELayout, GLWESecret, Rank, TorusPrecision,
     prepared::{GGSWPrepared, GLWESecretPrepared},
 };
 use std::hint::black_box;
@@ -28,7 +28,7 @@
     fn runner(p: Params) -> impl FnMut() {
         let module: Module<FFT64Spqlios> = Module::<FFT64Spqlios>::new(1 << p.log_n);
 
-        let n: RingDegree = RingDegree(module.n() as u32);
+        let n: Degree = Degree(module.n() as u32);
         let base2k: Base2K = p.base2k;
         let k_ct_in: TorusPrecision = p.k_ct_in;
         let k_ct_out: TorusPrecision = p.k_ct_out;
@@ -140,7 +140,7 @@
     fn runner(p: Params) -> impl FnMut() {
         let module: Module<FFT64Spqlios> = Module::<FFT64Spqlios>::new(1 << p.log_n);
 
-        let n: RingDegree = RingDegree(module.n() as u32);
+        let n: Degree = Degree(module.n() as u32);
         let base2k: Base2K = p.base2k;
         let k_glwe: TorusPrecision = p.k_ct;
         let k_ggsw: TorusPrecision = p.k_ggsw;

@@ -1,6 +1,6 @@
 use poulpy_core::layouts::{
-    AutomorphismKey, AutomorphismKeyLayout, Base2K, Dnum, Dsize, GLWE, GLWELayout, GLWESecret, GLWESwitchingKey,
-    GLWESwitchingKeyLayout, GLWESwitchingKeyPrepared, Rank, RingDegree, TorusPrecision,
+    AutomorphismKey, AutomorphismKeyLayout, Base2K, Degree, Dnum, Dsize, GLWE, GLWELayout, GLWESecret, GLWESwitchingKey,
+    GLWESwitchingKeyLayout, GLWESwitchingKeyPrepared, Rank, TorusPrecision,
     prepared::{AutomorphismKeyPrepared, GLWESecretPrepared},
 };
 use std::{hint::black_box, time::Duration};
@@ -29,7 +29,7 @@
     fn runner(p: Params) -> impl FnMut() {
         let module: Module<FFT64Spqlios> = Module::<FFT64Spqlios>::new(1 << p.log_n);
 
-        let n: RingDegree = RingDegree(module.n() as u32);
+        let n: Degree = Degree(module.n() as u32);
         let base2k: Base2K = p.base2k;
         let k_glwe_in: TorusPrecision = p.k_ct_in;
         let k_glwe_out: TorusPrecision = p.k_ct_out;
@@ -151,7 +151,7 @@
     fn runner(p: Params) -> impl FnMut() {
         let module: Module<FFT64Spqlios> = Module::<FFT64Spqlios>::new(1 << p.log_n);
 
-        let n: RingDegree = RingDegree(module.n() as u32);
+        let n: Degree = Degree(module.n() as u32);
         let base2k: Base2K = p.base2k;
         let k_ct: TorusPrecision = p.k_ct;
         let k_ksk: TorusPrecision = p.k_ksk;

@@ -2,7 +2,7 @@ use poulpy_backend::cpu_spqlios::FFT64Spqlios;
 use poulpy_core::{
     GLWESub, SIGMA,
     layouts::{
-        Base2K, GLWE, GLWELayout, GLWEPlaintext, GLWEPlaintextLayout, GLWESecret, LWEInfos, Rank, RingDegree, TorusPrecision,
+        Base2K, Degree, GLWE, GLWELayout, GLWEPlaintext, GLWEPlaintextLayout, GLWESecret, LWEInfos, Rank, TorusPrecision,
         prepared::GLWESecretPrepared,
     },
 };
@@ -16,7 +16,7 @@ fn main() {
     // Ring degree
     let log_n: usize = 10;
 
-    let n: RingDegree = RingDegree(1 << log_n);
+    let n: Degree = Degree(1 << log_n);
 
     // Base-2-k (implicit digit decomposition)
     let base2k: Base2K = Base2K(14);

@@ -4,8 +4,7 @@ source::Source,
 };
 
 use crate::layouts::{
-    AutomorphismKey, AutomorphismKeyToMut, Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, Rank, RingDegree,
-    TorusPrecision,
+    AutomorphismKey, AutomorphismKeyToMut, Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, Rank, TorusPrecision,
     compressed::{
         GLWESwitchingKeyCompressed, GLWESwitchingKeyCompressedAlloc, GLWESwitchingKeyCompressedToMut,
         GLWESwitchingKeyCompressedToRef, GLWESwitchingKeyDecompress,
@@ -22,7 +21,7 @@ pub(crate) p: i64,
 }
 
 impl<D: Data> LWEInfos for AutomorphismKeyCompressed<D> {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.key.n()
     }
 
@@ -79,6 +78,8 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "(AutomorphismKeyCompressed: p={}) {}", self.p, self.key)
     }
 }
+
+impl<BE: Backend> AutomorphismKeyCompressedAlloc for Module<BE> where Self: GLWESwitchingKeyCompressedAlloc {}
 
 pub trait AutomorphismKeyCompressedAlloc
 where

@@ -7,7 +7,7 @@ source::Source,
 };
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWE, GGLWEInfos, GGLWEToMut, GLWEInfos, GetRingDegree, LWEInfos, Rank, RingDegree, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWE, GGLWEInfos, GGLWEToMut, GLWEInfos, GetDegree, LWEInfos, Rank, TorusPrecision,
     compressed::{GLWECompressed, GLWEDecompress},
 };
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
@@ -24,8 +24,8 @@ pub(crate) seed: Vec<[u8; 32]>,
 }
 
 impl<D: Data> LWEInfos for GGLWECompressed<D> {
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 
     fn base2k(&self) -> Base2K {
@@ -88,7 +88,7 @@ }
 
 pub trait GGLWECompressedAlloc
 where
-    Self: GetRingDegree,
+    Self: GetDegree,
 {
     fn alloc_gglwe_compressed(
         &self,
@@ -183,7 +183,7 @@ )
     }
 }
 
-impl<B: Backend> GGLWECompressedAlloc for Module<B> where Self: GetRingDegree {}
+impl<B: Backend> GGLWECompressedAlloc for Module<B> where Self: GetDegree {}
 
 impl GGLWECompressed<Vec<u8>> {
     pub fn alloc_from_infos<A, M>(module: &M, infos: &A) -> Self

@@ -4,8 +4,8 @@ source::Source,
 };
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWESwitchingKey, GLWESwitchingKeySetMetaData, GLWESwitchingKeyToMut, LWEInfos,
-    Rank, RingDegree, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWESwitchingKey, GLWESwitchingKeySetMetaData, GLWESwitchingKeyToMut,
+    LWEInfos, Rank, TorusPrecision,
     compressed::{GGLWECompressed, GGLWECompressedAlloc, GGLWECompressedToMut, GGLWECompressedToRef, GGLWEDecompress},
 };
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
@@ -19,7 +19,7 @@ pub(crate) sk_out_n: usize, // Degree of sk_out
 }
 
 impl<D: Data> LWEInfos for GLWESwitchingKeyCompressed<D> {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.key.n()
     }
 
@@ -80,6 +80,8 @@ self.sk_in_n, self.sk_out_n, self.key.data
         )
     }
 }
+
+impl<BE: Backend> GLWESwitchingKeyCompressedAlloc for Module<BE> where Self: GGLWECompressedAlloc {}
 
 pub trait GLWESwitchingKeyCompressedAlloc
 where

@@ -4,7 +4,7 @@ source::Source,
 };
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, Rank, RingDegree, TensorKey, TensorKeyToMut, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, Rank, TensorKey, TensorKeyToMut, TorusPrecision,
     compressed::{
         GLWESwitchingKeyCompressed, GLWESwitchingKeyCompressedAlloc, GLWESwitchingKeyCompressedToMut,
         GLWESwitchingKeyCompressedToRef, GLWESwitchingKeyDecompress,
@@ -19,7 +19,7 @@ pub(crate) keys: Vec<GLWESwitchingKeyCompressed<D>>,
 }
 
 impl<D: Data> LWEInfos for TensorKeyCompressed<D> {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.keys[0].n()
     }
 
@@ -81,6 +81,8 @@ }
         Ok(())
     }
 }
+
+impl<BE: Backend> TensorKeyCompressedAlloc for Module<BE> where Self: GLWESwitchingKeyCompressedAlloc {}
 
 pub trait TensorKeyCompressedAlloc
 where

@@ -6,7 +6,7 @@ source::Source,
 };
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGSW, GGSWInfos, GGSWToMut, GLWEInfos, GetRingDegree, LWEInfos, Rank, RingDegree, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGSW, GGSWInfos, GGSWToMut, GLWEInfos, GetDegree, LWEInfos, Rank, TorusPrecision,
     compressed::{GLWECompressed, GLWEDecompress},
 };
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
@@ -23,8 +23,8 @@ pub(crate) seed: Vec<[u8; 32]>,
 }
 
 impl<D: Data> LWEInfos for GGSWCompressed<D> {
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 
     fn base2k(&self) -> Base2K {
@@ -76,9 +76,11 @@ self.data.fill_uniform(log_bound, source);
     }
 }
 
+impl<BE: Backend> GGSWCompressedAlloc for Module<BE> where Self: GetDegree {}
+
 pub trait GGSWCompressedAlloc
 where
-    Self: GetRingDegree,
+    Self: GetDegree,
 {
     fn alloc_ggsw_compressed(
         &self,

@@ -6,9 +6,7 @@ },
     source::Source,
 };
 
-use crate::layouts::{
-    Base2K, GLWE, GLWEInfos, GLWEToMut, GetRingDegree, LWEInfos, Rank, RingDegree, SetGLWEInfos, TorusPrecision,
-};
+use crate::layouts::{Base2K, Degree, GLWE, GLWEInfos, GLWEToMut, GetDegree, LWEInfos, Rank, SetGLWEInfos, TorusPrecision};
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 use std::fmt;
 
@@ -34,8 +32,8 @@ fn size(&self) -> usize {
         self.data.size()
     }
 
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 }
 impl<D: Data> GLWEInfos for GLWECompressed<D> {
@@ -72,7 +70,7 @@ }
 
 pub trait GLWECompressedAlloc
 where
-    Self: GetRingDegree,
+    Self: GetDegree,
 {
     fn alloc_glwe_compressed(&self, base2k: Base2K, k: TorusPrecision, rank: Rank) -> GLWECompressed<Vec<u8>> {
         GLWECompressed {
@@ -113,7 +111,7 @@ self.bytes_of_glwe_compressed(infos.base2k(), infos.k())
     }
 }
 
-impl<B: Backend> GLWECompressedAlloc for Module<B> where Self: GetRingDegree {}
+impl<B: Backend> GLWECompressedAlloc for Module<B> where Self: GetDegree {}
 
 impl GLWECompressed<Vec<u8>> {
     pub fn alloc_from_infos<A, M>(module: &M, infos: &A) -> Self
@@ -169,7 +167,7 @@ }
 
 pub trait GLWEDecompress
 where
-    Self: GetRingDegree + VecZnxFillUniform + VecZnxCopy,
+    Self: GetDegree + VecZnxFillUniform + VecZnxCopy,
 {
     fn decompress_glwe<R, O>(&self, res: &mut R, other: &O)
     where
@@ -203,7 +201,7 @@ res.set_k(other.k());
     }
 }
 
-impl<B: Backend> GLWEDecompress for Module<B> where Self: GetRingDegree + VecZnxFillUniform + VecZnxCopy {}
+impl<B: Backend> GLWEDecompress for Module<B> where Self: GetDegree + VecZnxFillUniform + VecZnxCopy {}
 
 impl<D: DataMut> GLWE<D> {
     pub fn decompress<O, M>(&mut self, module: &M, other: &O)

@@ -6,7 +6,7 @@ source::Source,
 };
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWEToLWESwitchingKey, GLWEToLWESwitchingKeyToMut, LWEInfos, Rank, RingDegree,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWEToLWESwitchingKey, GLWEToLWESwitchingKeyToMut, LWEInfos, Rank,
     TorusPrecision,
     compressed::{
         GLWESwitchingKeyCompressed, GLWESwitchingKeyCompressedAlloc, GLWESwitchingKeyCompressedToMut,
@@ -26,7 +26,7 @@ fn k(&self) -> TorusPrecision {
         self.0.k()
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.0.n()
     }
     fn size(&self) -> usize {

@@ -9,7 +9,7 @@ },
     source::Source,
 };
 
-use crate::layouts::{Base2K, LWE, LWEInfos, LWEToMut, RingDegree, TorusPrecision};
+use crate::layouts::{Base2K, Degree, LWE, LWEInfos, LWEToMut, TorusPrecision};
 
 #[derive(PartialEq, Eq, Clone)]
 pub struct LWECompressed<D: Data> {
@@ -28,8 +28,8 @@ fn k(&self) -> TorusPrecision {
         self.k
     }
 
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 
     fn size(&self) -> usize {

@@ -4,8 +4,7 @@ source::Source,
 };
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, LWESwitchingKey, LWESwitchingKeyToMut, Rank, RingDegree,
-    TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, LWESwitchingKey, LWESwitchingKeyToMut, Rank, TorusPrecision,
     compressed::{
         GLWESwitchingKeyCompressed, GLWESwitchingKeyCompressedAlloc, GLWESwitchingKeyCompressedToMut,
         GLWESwitchingKeyCompressedToRef, GLWESwitchingKeyDecompress,
@@ -25,7 +24,7 @@ fn k(&self) -> TorusPrecision {
         self.0.k()
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.0.n()
     }
     fn size(&self) -> usize {

@@ -4,7 +4,7 @@ source::Source,
 };
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, LWEToGLWESwitchingKey, LWEToGLWESwitchingKeyToMut, Rank, RingDegree,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, LWEToGLWESwitchingKey, LWEToGLWESwitchingKeyToMut, Rank,
     TorusPrecision,
     compressed::{
         GLWESwitchingKeyCompressed, GLWESwitchingKeyCompressedAlloc, GLWESwitchingKeyCompressedToMut,
@@ -17,7 +17,7 @@ #[derive(PartialEq, Eq, Clone)]
 pub struct LWEToGLWESwitchingKeyCompressed<D: Data>(pub(crate) GLWESwitchingKeyCompressed<D>);
 
 impl<D: Data> LWEInfos for LWEToGLWESwitchingKeyCompressed<D> {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.0.n()
     }
 
@@ -85,6 +85,8 @@ fn write_to<W: std::io::Write>(&self, writer: &mut W) -> std::io::Result<()> {
         self.0.write_to(writer)
     }
 }
+
+impl<BE: Backend> LWEToGLWESwitchingKeyCompressedAlloc for Module<BE> where Self: GLWESwitchingKeyCompressedAlloc {}
 
 pub trait LWEToGLWESwitchingKeyCompressedAlloc
 where

@@ -4,8 +4,8 @@ source::Source,
 };
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWEInfos, GLWE, GLWEInfos, GLWESwitchingKey, GLWESwitchingKeyAlloc, GLWESwitchingKeyToMut,
-    GLWESwitchingKeyToRef, LWEInfos, Rank, RingDegree, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWE, GLWEInfos, GLWESwitchingKey, GLWESwitchingKeyAlloc, GLWESwitchingKeyToMut,
+    GLWESwitchingKeyToRef, LWEInfos, Rank, TorusPrecision,
     prepared::{GetAutomorphismGaloisElement, SetAutomorphismGaloisElement},
 };
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
@@ -14,7 +14,7 @@ use std::fmt;
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct AutomorphismKeyLayout {
-    pub n: RingDegree,
+    pub n: Degree,
     pub base2k: Base2K,
     pub k: TorusPrecision,
     pub rank: Rank,
@@ -47,7 +47,7 @@ }
 }
 
 impl<D: Data> LWEInfos for AutomorphismKey<D> {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.key.n()
     }
 
@@ -97,7 +97,7 @@ fn k(&self) -> TorusPrecision {
         self.k
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.n
     }
 }

@@ -5,7 +5,7 @@ },
     source::Source,
 };
 
-use crate::layouts::{Base2K, Dnum, Dsize, GLWE, GLWEInfos, GetRingDegree, LWEInfos, Rank, RingDegree, TorusPrecision};
+use crate::layouts::{Base2K, Degree, Dnum, Dsize, GLWE, GLWEInfos, GetDegree, LWEInfos, Rank, TorusPrecision};
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 
 use std::fmt;
@@ -37,7 +37,7 @@ }
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct GGLWELayout {
-    pub n: RingDegree,
+    pub n: Degree,
     pub base2k: Base2K,
     pub k: TorusPrecision,
     pub rank_in: Rank,
@@ -55,7 +55,7 @@ fn k(&self) -> TorusPrecision {
         self.k
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.n
     }
 }
@@ -101,8 +101,8 @@ fn k(&self) -> TorusPrecision {
         self.k
     }
 
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 
     fn size(&self) -> usize {
@@ -193,7 +193,7 @@ }
 
 pub trait GGLWEAlloc
 where
-    Self: GetRingDegree,
+    Self: GetDegree,
 {
     fn alloc_gglwe(
         &self,
@@ -293,7 +293,7 @@ )
     }
 }
 
-impl<B: Backend> GGLWEAlloc for Module<B> where Self: GetRingDegree {}
+impl<B: Backend> GGLWEAlloc for Module<B> where Self: GetDegree {}
 
 impl GGLWE<Vec<u8>> {
     pub fn alloc_from_infos<A, M>(module: &M, infos: &A) -> Self

@@ -4,7 +4,7 @@ source::Source,
 };
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWE, GGLWEAlloc, GGLWEInfos, GGLWEToMut, GGLWEToRef, GLWE, GLWEInfos, LWEInfos, Rank, RingDegree,
+    Base2K, Degree, Dnum, Dsize, GGLWE, GGLWEAlloc, GGLWEInfos, GGLWEToMut, GGLWEToRef, GLWE, GLWEInfos, LWEInfos, Rank,
     TorusPrecision,
 };
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
@@ -13,7 +13,7 @@ use std::fmt;
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct GLWESwitchingKeyLayout {
-    pub n: RingDegree,
+    pub n: Degree,
     pub base2k: Base2K,
     pub k: TorusPrecision,
     pub rank_in: Rank,
@@ -23,7 +23,7 @@ pub dsize: Dsize,
 }
 
 impl LWEInfos for GLWESwitchingKeyLayout {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.n
     }
 
@@ -98,7 +98,7 @@ }
 }
 
 impl<D: Data> LWEInfos for GLWESwitchingKey<D> {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.key.n()
     }
 

@@ -4,8 +4,8 @@ source::Source,
 };
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWESwitchingKey, GLWESwitchingKeyAlloc, GLWESwitchingKeyToMut,
-    GLWESwitchingKeyToRef, LWEInfos, Rank, RingDegree, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWESwitchingKey, GLWESwitchingKeyAlloc, GLWESwitchingKeyToMut,
+    GLWESwitchingKeyToRef, LWEInfos, Rank, TorusPrecision,
 };
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 
@@ -13,7 +13,7 @@ use std::fmt;
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct TensorKeyLayout {
-    pub n: RingDegree,
+    pub n: Degree,
     pub base2k: Base2K,
     pub k: TorusPrecision,
     pub rank: Rank,
@@ -27,7 +27,7 @@ pub(crate) keys: Vec<GLWESwitchingKey<D>>,
 }
 
 impl<D: Data> LWEInfos for TensorKey<D> {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.keys[0].n()
     }
 
@@ -69,7 +69,7 @@ }
 }
 
 impl LWEInfos for TensorKeyLayout {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.n
     }
 

@@ -6,7 +6,7 @@ source::Source,
 };
 use std::fmt;
 
-use crate::layouts::{Base2K, Dnum, Dsize, GLWE, GLWEInfos, GetRingDegree, LWEInfos, Rank, RingDegree, TorusPrecision};
+use crate::layouts::{Base2K, Degree, Dnum, Dsize, GLWE, GLWEInfos, GetDegree, LWEInfos, Rank, TorusPrecision};
 
 pub trait GGSWInfos
 where
@@ -28,7 +28,7 @@ }
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct GGSWLayout {
-    pub n: RingDegree,
+    pub n: Degree,
     pub base2k: Base2K,
     pub k: TorusPrecision,
     pub rank: Rank,
@@ -45,7 +45,7 @@ fn k(&self) -> TorusPrecision {
         self.k
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.n
     }
 }
@@ -74,8 +74,8 @@ pub(crate) dsize: Dsize,
 }
 
 impl<D: Data> LWEInfos for GGSW<D> {
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 
     fn base2k(&self) -> Base2K {
@@ -152,11 +152,11 @@ }
     }
 }
 
-impl<B: Backend> GGSWAlloc for Module<B> where Self: GetRingDegree {}
+impl<B: Backend> GGSWAlloc for Module<B> where Self: GetDegree {}
 
 pub trait GGSWAlloc
 where
-    Self: GetRingDegree,
+    Self: GetDegree,
 {
     fn alloc_ggsw(&self, base2k: Base2K, k: TorusPrecision, rank: Rank, dnum: Dnum, dsize: Dsize) -> GGSW<Vec<u8>> {
         let size: usize = k.0.div_ceil(base2k.0) as usize;

@@ -6,7 +6,7 @@ },
     source::Source,
 };
 
-use crate::layouts::{Base2K, GetRingDegree, LWEInfos, Rank, RingDegree, TorusPrecision};
+use crate::layouts::{Base2K, Degree, GetDegree, LWEInfos, Rank, TorusPrecision};
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 use std::fmt;
 
@@ -32,14 +32,14 @@ }
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct GLWELayout {
-    pub n: RingDegree,
+    pub n: Degree,
     pub base2k: Base2K,
     pub k: TorusPrecision,
     pub rank: Rank,
 }
 
 impl LWEInfos for GLWELayout {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.n
     }
 
@@ -96,8 +96,8 @@ fn k(&self) -> TorusPrecision {
         self.k
     }
 
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 
     fn size(&self) -> usize {
@@ -148,7 +148,7 @@ }
 
 pub trait GLWEAlloc
 where
-    Self: GetRingDegree,
+    Self: GetDegree,
 {
     fn alloc_glwe(&self, base2k: Base2K, k: TorusPrecision, rank: Rank) -> GLWE<Vec<u8>> {
         GLWE {
@@ -185,7 +185,7 @@ self.bytes_of_glwe(infos.base2k(), infos.k(), infos.rank())
     }
 }
 
-impl<B: Backend> GLWEAlloc for Module<B> where Self: GetRingDegree {}
+impl<B: Backend> GLWEAlloc for Module<B> where Self: GetDegree {}
 
 impl GLWE<Vec<u8>> {
     pub fn alloc_from_infos<A, M>(module: &M, infos: &A) -> Self

@@ -4,7 +4,7 @@ };
 
 use crate::{
     dist::Distribution,
-    layouts::{Base2K, GLWEInfos, GetRingDegree, LWEInfos, Rank, RingDegree, TorusPrecision},
+    layouts::{Base2K, Degree, GLWEInfos, GetDegree, LWEInfos, Rank, TorusPrecision},
 };
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 
@@ -18,7 +18,7 @@ }
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct GLWEPublicKeyLayout {
-    pub n: RingDegree,
+    pub n: Degree,
     pub base2k: Base2K,
     pub k: TorusPrecision,
     pub rank: Rank,
@@ -43,8 +43,8 @@ fn k(&self) -> TorusPrecision {
         self.k
     }
 
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 
     fn size(&self) -> usize {
@@ -67,7 +67,7 @@ fn k(&self) -> TorusPrecision {
         self.k
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.n
     }
 
@@ -84,7 +84,7 @@ }
 
 pub trait GLWEPublicKeyAlloc
 where
-    Self: GetRingDegree,
+    Self: GetDegree,
 {
     fn alloc_glwe_public_key(&self, base2k: Base2K, k: TorusPrecision, rank: Rank) -> GLWEPublicKey<Vec<u8>> {
         GLWEPublicKey {
@@ -122,7 +122,7 @@ self.bytes_of_glwe_public_key(infos.base2k(), infos.k(), infos.rank())
     }
 }
 
-impl<B: Backend> GLWEPublicKeyAlloc for Module<B> where Self: GetRingDegree {}
+impl<B: Backend> GLWEPublicKeyAlloc for Module<B> where Self: GetDegree {}
 
 impl GLWEPublicKey<Vec<u8>> {
     pub fn alloc_from_infos<A, M>(module: &M, infos: &A) -> Self

@@ -3,12 +3,12 @@
 use poulpy_hal::layouts::{Backend, Data, DataMut, DataRef, Module, VecZnx, VecZnxToMut, VecZnxToRef, ZnxInfos};
 
 use crate::layouts::{
-    Base2K, GLWE, GLWEInfos, GLWEToMut, GLWEToRef, GetRingDegree, LWEInfos, Rank, RingDegree, SetGLWEInfos, TorusPrecision,
+    Base2K, Degree, GLWE, GLWEInfos, GLWEToMut, GLWEToRef, GetDegree, LWEInfos, Rank, SetGLWEInfos, TorusPrecision,
 };
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct GLWEPlaintextLayout {
-    pub n: RingDegree,
+    pub n: Degree,
     pub base2k: Base2K,
     pub k: TorusPrecision,
 }
@@ -22,7 +22,7 @@ fn k(&self) -> TorusPrecision {
         self.k
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.n
     }
 }
@@ -62,8 +62,8 @@ fn size(&self) -> usize {
         self.data.size()
     }
 
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 }
 
@@ -87,7 +87,7 @@ }
 
 pub trait GLWEPlaintextAlloc
 where
-    Self: GetRingDegree,
+    Self: GetDegree,
 {
     fn alloc_glwe_plaintext(&self, base2k: Base2K, k: TorusPrecision) -> GLWEPlaintext<Vec<u8>> {
         GLWEPlaintext {
@@ -124,7 +124,7 @@ self.bytes_of_glwe_plaintext(infos.base2k(), infos.k())
     }
 }
 
-impl<B: Backend> GLWEPlaintextAlloc for Module<B> where Self: GetRingDegree {}
+impl<B: Backend> GLWEPlaintextAlloc for Module<B> where Self: GetDegree {}
 
 impl GLWEPlaintext<Vec<u8>> {
     pub fn alloc_from_infos<A, M>(module: &M, infos: &A) -> Self

@@ -8,12 +8,12 @@ };
 
 use crate::{
     dist::Distribution,
-    layouts::{Base2K, GLWEInfos, GetDist, GetRingDegree, LWEInfos, Rank, RingDegree, TorusPrecision},
+    layouts::{Base2K, Degree, GLWEInfos, GetDegree, GetDist, LWEInfos, Rank, TorusPrecision},
 };
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct GLWESecretLayout {
-    pub n: RingDegree,
+    pub n: Degree,
     pub rank: Rank,
 }
 
@@ -26,7 +26,7 @@ fn k(&self) -> TorusPrecision {
         TorusPrecision(0)
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.n
     }
 
@@ -55,8 +55,8 @@ fn k(&self) -> TorusPrecision {
         TorusPrecision(0)
     }
 
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 
     fn size(&self) -> usize {
@@ -78,7 +78,7 @@ }
 
 pub trait GLWESecretAlloc
 where
-    Self: GetRingDegree,
+    Self: GetDegree,
 {
     fn alloc_glwe_secret(&self, rank: Rank) -> GLWESecret<Vec<u8>> {
         GLWESecret {
@@ -106,7 +106,7 @@ self.bytes_of_glwe_secret(infos.rank())
     }
 }
 
-impl<B: Backend> GLWESecretAlloc for Module<B> where Self: GetRingDegree {}
+impl<B: Backend> GLWESecretAlloc for Module<B> where Self: GetDegree {}
 
 impl GLWESecret<Vec<u8>> {
     pub fn alloc_from_infos<A, M>(module: &M, infos: &A) -> Self

@@ -4,15 +4,15 @@ source::Source,
 };
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWESwitchingKey, GLWESwitchingKeyAlloc, GLWESwitchingKeyToMut,
-    GLWESwitchingKeyToRef, LWEInfos, Rank, RingDegree, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWESwitchingKey, GLWESwitchingKeyAlloc, GLWESwitchingKeyToMut,
+    GLWESwitchingKeyToRef, LWEInfos, Rank, TorusPrecision,
 };
 
 use std::fmt;
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct GLWEToLWEKeyLayout {
-    pub n: RingDegree,
+    pub n: Degree,
     pub base2k: Base2K,
     pub k: TorusPrecision,
     pub rank_in: Rank,
@@ -20,7 +20,7 @@ pub dnum: Dnum,
 }
 
 impl LWEInfos for GLWEToLWEKeyLayout {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.n
     }
 
@@ -70,7 +70,7 @@ fn k(&self) -> TorusPrecision {
         self.0.k()
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.0.n()
     }
 

@@ -5,11 +5,11 @@ layouts::{Backend, Data, DataMut, DataRef, FillUniform, Module, ReaderFrom, WriterTo, Zn, ZnToMut, ZnToRef, ZnxInfos},
     source::Source,
 };
 
-use crate::layouts::{Base2K, RingDegree, TorusPrecision};
+use crate::layouts::{Base2K, Degree, TorusPrecision};
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 
 pub trait LWEInfos {
-    fn n(&self) -> RingDegree;
+    fn n(&self) -> Degree;
     fn k(&self) -> TorusPrecision;
     fn max_k(&self) -> TorusPrecision {
         TorusPrecision(self.k().0 * self.size() as u32)
@@ -34,7 +34,7 @@ }
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct LWELayout {
-    pub n: RingDegree,
+    pub n: Degree,
     pub k: TorusPrecision,
     pub base2k: Base2K,
 }
@@ -48,7 +48,7 @@ fn k(&self) -> TorusPrecision {
         self.k
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.n
     }
 }
@@ -67,8 +67,8 @@
     fn k(&self) -> TorusPrecision {
         self.k
     }
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32 - 1)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32 - 1)
     }
 
     fn size(&self) -> usize {
@@ -126,7 +126,7 @@ }
 }
 
 pub trait LWEAlloc {
-    fn alloc_lwe(&self, n: RingDegree, base2k: Base2K, k: TorusPrecision) -> LWE<Vec<u8>> {
+    fn alloc_lwe(&self, n: Degree, base2k: Base2K, k: TorusPrecision) -> LWE<Vec<u8>> {
         LWE {
             data: Zn::alloc((n + 1).into(), 1, k.0.div_ceil(base2k.0) as usize),
             k,
@@ -141,7 +141,7 @@ {
         self.alloc_lwe(infos.n(), infos.base2k(), infos.k())
     }
 
-    fn bytes_of_lwe(&self, n: RingDegree, base2k: Base2K, k: TorusPrecision) -> usize {
+    fn bytes_of_lwe(&self, n: Degree, base2k: Base2K, k: TorusPrecision) -> usize {
         Zn::bytes_of((n + 1).into(), 1, k.0.div_ceil(base2k.0) as usize)
     }
 
@@ -164,7 +164,7 @@ {
         module.alloc_lwe_from_infos(infos)
     }
 
-    pub fn alloc<M>(module: &M, n: RingDegree, base2k: Base2K, k: TorusPrecision) -> Self
+    pub fn alloc<M>(module: &M, n: Degree, base2k: Base2K, k: TorusPrecision) -> Self
     where
         M: LWEAlloc,
     {
@@ -179,7 +179,7 @@ {
         module.bytes_of_lwe_from_infos(infos)
     }
 
-    pub fn bytes_of<M>(module: &M, n: RingDegree, base2k: Base2K, k: TorusPrecision) -> usize
+    pub fn bytes_of<M>(module: &M, n: Degree, base2k: Base2K, k: TorusPrecision) -> usize
     where
         M: LWEAlloc,
     {

@@ -6,20 +6,20 @@ source::Source,
 };
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWESwitchingKey, GLWESwitchingKeyAlloc, GLWESwitchingKeyToMut,
-    GLWESwitchingKeyToRef, LWEInfos, Rank, RingDegree, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWESwitchingKey, GLWESwitchingKeyAlloc, GLWESwitchingKeyToMut,
+    GLWESwitchingKeyToRef, LWEInfos, Rank, TorusPrecision,
 };
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct LWESwitchingKeyLayout {
-    pub n: RingDegree,
+    pub n: Degree,
     pub base2k: Base2K,
     pub k: TorusPrecision,
     pub dnum: Dnum,
 }
 
 impl LWEInfos for LWESwitchingKeyLayout {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.n
     }
 
@@ -68,7 +68,7 @@ fn k(&self) -> TorusPrecision {
         self.0.k()
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.0.n()
     }
 

@@ -2,7 +2,7 @@ use std::fmt;
 
 use poulpy_hal::layouts::{Backend, Data, DataMut, DataRef, Module, Zn, ZnToMut, ZnToRef, ZnxInfos};
 
-use crate::layouts::{Base2K, LWEInfos, RingDegree, TorusPrecision};
+use crate::layouts::{Base2K, Degree, LWEInfos, TorusPrecision};
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct LWEPlaintextLayout {
@@ -19,8 +19,8 @@ fn k(&self) -> TorusPrecision {
         self.k
     }
 
-    fn n(&self) -> RingDegree {
-        RingDegree(0)
+    fn n(&self) -> Degree {
+        Degree(0)
     }
 
     fn size(&self) -> usize {
@@ -43,8 +43,8 @@ fn k(&self) -> TorusPrecision {
         self.k
     }
 
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32 - 1)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32 - 1)
     }
 
     fn size(&self) -> usize {

@@ -5,7 +5,7 @@ };
 
 use crate::{
     dist::Distribution,
-    layouts::{Base2K, LWEInfos, RingDegree, TorusPrecision},
+    layouts::{Base2K, Degree, LWEInfos, TorusPrecision},
 };
 
 pub struct LWESecret<D: Data> {
@@ -14,7 +14,7 @@ pub(crate) dist: Distribution,
 }
 
 pub trait LWESecretAlloc {
-    fn alloc_lwe_secret(&self, n: RingDegree) -> LWESecret<Vec<u8>> {
+    fn alloc_lwe_secret(&self, n: Degree) -> LWESecret<Vec<u8>> {
         LWESecret {
             data: ScalarZnx::alloc(n.into(), 1),
             dist: Distribution::NONE,
@@ -25,7 +25,7 @@
 impl<B: Backend> LWESecretAlloc for Module<B> {}
 
 impl LWESecret<Vec<u8>> {
-    pub fn alloc<M>(module: &M, n: RingDegree) -> Self
+    pub fn alloc<M>(module: &M, n: Degree) -> Self
     where
         M: LWESecretAlloc,
     {
@@ -55,8 +55,8 @@ fn k(&self) -> TorusPrecision {
         TorusPrecision(0)
     }
 
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 
     fn size(&self) -> usize {

@@ -6,13 +6,13 @@ source::Source,
 };
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWESwitchingKey, GLWESwitchingKeyAlloc, GLWESwitchingKeyToMut,
-    GLWESwitchingKeyToRef, LWEInfos, Rank, RingDegree, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWESwitchingKey, GLWESwitchingKeyAlloc, GLWESwitchingKeyToMut,
+    GLWESwitchingKeyToRef, LWEInfos, Rank, TorusPrecision,
 };
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct LWEToGLWESwitchingKeyLayout {
-    pub n: RingDegree,
+    pub n: Degree,
     pub base2k: Base2K,
     pub k: TorusPrecision,
     pub rank_out: Rank,
@@ -28,7 +28,7 @@ fn k(&self) -> TorusPrecision {
         self.k
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.n
     }
 }
@@ -69,7 +69,7 @@ fn k(&self) -> TorusPrecision {
         self.0.k()
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.0.n()
     }
 

@@ -37,12 +37,12 @@ pub use prepared::*;
 
 use poulpy_hal::layouts::{Backend, Module};
 
-pub trait GetRingDegree {
-    fn ring_degree(&self) -> RingDegree;
+pub trait GetDegree {
+    fn ring_degree(&self) -> Degree;
 }
 
-impl<B: Backend> GetRingDegree for Module<B> {
-    fn ring_degree(&self) -> RingDegree {
+impl<B: Backend> GetDegree for Module<B> {
+    fn ring_degree(&self) -> Degree {
         Self::n(&self).into()
     }
 }
@@ -204,14 +204,14 @@ }
     };
 }
 
-newtype_u32!(RingDegree);
+newtype_u32!(Degree);
 newtype_u32!(TorusPrecision);
 newtype_u32!(Base2K);
 newtype_u32!(Dnum);
 newtype_u32!(Rank);
 newtype_u32!(Dsize);
 
-impl RingDegree {
+impl Degree {
     pub fn log2(&self) -> usize {
         let n: usize = self.0 as usize;
         (usize::BITS - (n - 1).leading_zeros()) as _

@@ -1,7 +1,7 @@
 use poulpy_hal::layouts::{Backend, Data, DataMut, DataRef, Module, Scratch};
 
 use crate::layouts::{
-    AutomorphismKeyToRef, Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, Rank, RingDegree, TorusPrecision,
+    AutomorphismKeyToRef, Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, Rank, TorusPrecision,
     prepared::{
         GLWESwitchingKeyPrepare, GLWESwitchingKeyPrepared, GLWESwitchingKeyPreparedAlloc, GLWESwitchingKeyPreparedToMut,
         GLWESwitchingKeyPreparedToRef,
@@ -15,7 +15,7 @@ pub(crate) p: i64,
 }
 
 impl<D: Data, B: Backend> LWEInfos for AutomorphismKeyPrepared<D, B> {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.key.n()
     }
 

@@ -4,7 +4,7 @@ layouts::{Backend, Data, DataMut, DataRef, Module, Scratch, VmpPMat, VmpPMatToMut, VmpPMatToRef, ZnxInfos},
 };
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWE, GGLWEInfos, GGLWEToRef, GLWEInfos, GetRingDegree, LWEInfos, Rank, RingDegree, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWE, GGLWEInfos, GGLWEToRef, GLWEInfos, GetDegree, LWEInfos, Rank, TorusPrecision,
 };
 
 #[derive(PartialEq, Eq)]
@@ -16,8 +16,8 @@ pub(crate) dsize: Dsize,
 }
 
 impl<D: Data, B: Backend> LWEInfos for GGLWEPrepared<D, B> {
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 
     fn base2k(&self) -> Base2K {
@@ -59,7 +59,7 @@ }
 
 pub trait GGLWEPreparedAlloc<B: Backend>
 where
-    Self: GetRingDegree + VmpPMatAlloc<B> + VmpPMatBytesOf,
+    Self: GetDegree + VmpPMatAlloc<B> + VmpPMatBytesOf,
 {
     fn alloc_gglwe_prepared(
         &self,
@@ -149,7 +149,7 @@ )
     }
 }
 
-impl<B: Backend> GGLWEPreparedAlloc<B> for Module<B> where Module<B>: GetRingDegree + VmpPMatAlloc<B> + VmpPMatBytesOf {}
+impl<B: Backend> GGLWEPreparedAlloc<B> for Module<B> where Module<B>: GetDegree + VmpPMatAlloc<B> + VmpPMatBytesOf {}
 
 impl<B: Backend> GGLWEPrepared<Vec<u8>, B> {
     pub fn alloc_from_infos<A, M>(module: &M, infos: &A) -> Self
@@ -201,7 +201,7 @@ }
 
 pub trait GGLWEPrepare<B: Backend>
 where
-    Self: GetRingDegree + VmpPrepareTmpBytes + VmpPrepare<B>,
+    Self: GetDegree + VmpPrepareTmpBytes + VmpPrepare<B>,
 {
     fn prepare_gglwe_tmp_bytes<A>(&self, infos: &A) -> usize
     where
@@ -233,7 +233,7 @@ self.vmp_prepare(&mut res.data, &other.data, scratch);
     }
 }
 
-impl<B: Backend> GGLWEPrepare<B> for Module<B> where Self: GetRingDegree + VmpPrepareTmpBytes + VmpPrepare<B> {}
+impl<B: Backend> GGLWEPrepare<B> for Module<B> where Self: GetDegree + VmpPrepareTmpBytes + VmpPrepare<B> {}
 
 impl<D: DataMut, B: Backend> GGLWEPrepared<D, B> {
     pub fn prepare<O, M>(&mut self, module: &M, other: &O, scratch: &mut Scratch<B>)

@@ -1,8 +1,8 @@
 use poulpy_hal::layouts::{Backend, Data, DataMut, DataRef, Module, Scratch};
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWESwitchingKeySetMetaData, GLWESwitchingKeyToRef, GLWESwtichingKeyGetMetaData,
-    LWEInfos, Rank, RingDegree, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWESwitchingKeySetMetaData, GLWESwitchingKeyToRef,
+    GLWESwtichingKeyGetMetaData, LWEInfos, Rank, TorusPrecision,
     prepared::{GGLWEPrepare, GGLWEPrepared, GGLWEPreparedAlloc, GGLWEPreparedToMut, GGLWEPreparedToRef},
 };
 
@@ -34,7 +34,7 @@ }
 }
 
 impl<D: Data, B: Backend> LWEInfos for GLWESwitchingKeyPrepared<D, B> {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.key.n()
     }
 

@@ -1,7 +1,7 @@
 use poulpy_hal::layouts::{Backend, Data, DataMut, DataRef, Module, Scratch};
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, Rank, RingDegree, TensorKey, TensorKeyToRef, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, Rank, TensorKey, TensorKeyToRef, TorusPrecision,
     prepared::{
         GLWESwitchingKeyPrepare, GLWESwitchingKeyPrepared, GLWESwitchingKeyPreparedAlloc, GLWESwitchingKeyPreparedToMut,
         GLWESwitchingKeyPreparedToRef,
@@ -14,7 +14,7 @@ pub(crate) keys: Vec<GLWESwitchingKeyPrepared<D, B>>,
 }
 
 impl<D: Data, B: Backend> LWEInfos for TensorKeyPrepared<D, B> {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.keys[0].n()
     }
 

@@ -4,7 +4,7 @@ layouts::{Backend, Data, DataMut, DataRef, Module, Scratch, VmpPMat, VmpPMatToMut, VmpPMatToRef, ZnxInfos},
 };
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGSW, GGSWInfos, GGSWToRef, GLWEInfos, GetRingDegree, LWEInfos, Rank, RingDegree, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGSW, GGSWInfos, GGSWToRef, GLWEInfos, GetDegree, LWEInfos, Rank, TorusPrecision,
 };
 
 #[derive(PartialEq, Eq)]
@@ -16,8 +16,8 @@ pub(crate) dsize: Dsize,
 }
 
 impl<D: Data, B: Backend> LWEInfos for GGSWPrepared<D, B> {
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 
     fn base2k(&self) -> Base2K {
@@ -51,7 +51,7 @@ }
 
 pub trait GGSWPreparedAlloc<B: Backend>
 where
-    Self: GetRingDegree + VmpPMatAlloc<B> + VmpPMatBytesOf,
+    Self: GetDegree + VmpPMatAlloc<B> + VmpPMatBytesOf,
 {
     fn alloc_ggsw_prepared(
         &self,
@@ -135,7 +135,7 @@ )
     }
 }
 
-impl<B: Backend> GGSWPreparedAlloc<B> for Module<B> where Self: GetRingDegree + VmpPMatAlloc<B> + VmpPMatBytesOf {}
+impl<B: Backend> GGSWPreparedAlloc<B> for Module<B> where Self: GetDegree + VmpPMatAlloc<B> + VmpPMatBytesOf {}
 
 impl<B: Backend> GGSWPrepared<Vec<u8>, B> {
     pub fn alloc_from_infos<A, M>(module: &M, infos: &A) -> Self
@@ -177,7 +177,7 @@ }
 
 pub trait GGSWPrepare<B: Backend>
 where
-    Self: GetRingDegree + VmpPrepareTmpBytes + VmpPrepare<B>,
+    Self: GetDegree + VmpPrepareTmpBytes + VmpPrepare<B>,
 {
     fn ggsw_prepare_tmp_bytes<A>(&self, infos: &A) -> usize
     where
@@ -207,7 +207,7 @@ self.vmp_prepare(&mut res.data, &other.data, scratch);
     }
 }
 
-impl<B: Backend> GGSWPrepare<B> for Module<B> where Self: GetRingDegree + VmpPrepareTmpBytes + VmpPrepare<B> {}
+impl<B: Backend> GGSWPrepare<B> for Module<B> where Self: GetDegree + VmpPrepareTmpBytes + VmpPrepare<B> {}
 
 impl<B: Backend> GGSWPrepared<Vec<u8>, B> {
     pub fn prepare_tmp_bytes<A, M>(&self, module: &M, infos: &A) -> usize

@@ -5,9 +5,7 @@ };
 
 use crate::{
     dist::Distribution,
-    layouts::{
-        Base2K, GLWEInfos, GLWEPublicKey, GLWEPublicKeyToRef, GetDist, GetRingDegree, LWEInfos, Rank, RingDegree, TorusPrecision,
-    },
+    layouts::{Base2K, Degree, GLWEInfos, GLWEPublicKey, GLWEPublicKeyToRef, GetDegree, GetDist, LWEInfos, Rank, TorusPrecision},
 };
 
 #[derive(PartialEq, Eq)]
@@ -41,8 +39,8 @@ fn size(&self) -> usize {
         self.data.size()
     }
 
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 }
 
@@ -54,7 +52,7 @@ }
 
 pub trait GLWEPublicKeyPreparedAlloc<B: Backend>
 where
-    Self: GetRingDegree + VecZnxDftAlloc<B> + VecZnxDftBytesOf,
+    Self: GetDegree + VecZnxDftAlloc<B> + VecZnxDftBytesOf,
 {
     fn alloc_glwe_public_key_prepared(&self, base2k: Base2K, k: TorusPrecision, rank: Rank) -> GLWEPublicKeyPrepared<Vec<u8>, B> {
         GLWEPublicKeyPrepared {
@@ -120,7 +118,7 @@ }
 
 pub trait GLWEPublicKeyPrepare<B: Backend>
 where
-    Self: GetRingDegree + VecZnxDftApply<B>,
+    Self: GetDegree + VecZnxDftApply<B>,
 {
     fn prepare_glwe_public_key<R, O>(&self, res: &mut R, other: &O)
     where
@@ -146,7 +144,7 @@ res.set_dist(other.get_dist());
     }
 }
 
-impl<B: Backend> GLWEPublicKeyPrepare<B> for Module<B> where Self: GetRingDegree + VecZnxDftApply<B> {}
+impl<B: Backend> GLWEPublicKeyPrepare<B> for Module<B> where Self: GetDegree + VecZnxDftApply<B> {}
 
 impl<D: DataMut, B: Backend> GLWEPublicKeyPrepared<D, B> {
     pub fn prepare<O, M>(&mut self, module: &M, other: &O)

@@ -6,7 +6,7 @@
 use crate::{
     dist::Distribution,
     layouts::{
-        Base2K, GLWEInfos, GLWESecret, GLWESecretToRef, GetDist, GetRingDegree, LWEInfos, Rank, RingDegree, TorusPrecision,
+        Base2K, Degree, GLWEInfos, GLWESecret, GLWESecretToRef, GetDegree, GetDist, LWEInfos, Rank, TorusPrecision,
         prepared::SetDist,
     },
 };
@@ -31,8 +31,8 @@ fn k(&self) -> TorusPrecision {
         TorusPrecision(0)
     }
 
-    fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 
     fn size(&self) -> usize {
@@ -47,7 +47,7 @@ }
 
 pub trait GLWESecretPreparedAlloc<B: Backend>
 where
-    Self: GetRingDegree + SvpPPolBytesOf + SvpPPolAlloc<B>,
+    Self: GetDegree + SvpPPolBytesOf + SvpPPolAlloc<B>,
 {
     fn alloc_glwe_secret_prepared(&self, rank: Rank) -> GLWESecretPrepared<Vec<u8>, B> {
         GLWESecretPrepared {
@@ -75,7 +75,7 @@ self.bytes_of_glwe_secret_prepared(infos.rank())
     }
 }
 
-impl<B: Backend> GLWESecretPreparedAlloc<B> for Module<B> where Self: GetRingDegree + SvpPPolBytesOf + SvpPPolAlloc<B> {}
+impl<B: Backend> GLWESecretPreparedAlloc<B> for Module<B> where Self: GetDegree + SvpPPolBytesOf + SvpPPolAlloc<B> {}
 
 impl<B: Backend> GLWESecretPrepared<Vec<u8>, B> {
     pub fn alloc_from_infos<A, M>(module: &M, infos: &A) -> Self
@@ -110,8 +110,8 @@ }
 }
 
 impl<D: Data, B: Backend> GLWESecretPrepared<D, B> {
-    pub fn n(&self) -> RingDegree {
-        RingDegree(self.data.n() as u32)
+    pub fn n(&self) -> Degree {
+        Degree(self.data.n() as u32)
     }
 
     pub fn rank(&self) -> Rank {

@@ -1,7 +1,7 @@
 use poulpy_hal::layouts::{Backend, Data, DataMut, DataRef, Module, Scratch};
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWEToLWESwitchingKeyToRef, LWEInfos, Rank, RingDegree, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, GLWEToLWESwitchingKeyToRef, LWEInfos, Rank, TorusPrecision,
     prepared::{
         GLWESwitchingKeyPrepare, GLWESwitchingKeyPrepared, GLWESwitchingKeyPreparedAlloc, GLWESwitchingKeyPreparedToMut,
         GLWESwitchingKeyPreparedToRef,
@@ -20,7 +20,7 @@ fn k(&self) -> TorusPrecision {
         self.0.k()
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.0.n()
     }
 

@@ -1,7 +1,7 @@
 use poulpy_hal::layouts::{Backend, Data, DataMut, DataRef, Module, Scratch};
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, LWESwitchingKeyToRef, Rank, RingDegree, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, LWESwitchingKeyToRef, Rank, TorusPrecision,
     prepared::{
         GLWESwitchingKeyPrepare, GLWESwitchingKeyPrepared, GLWESwitchingKeyPreparedAlloc, GLWESwitchingKeyPreparedToMut,
         GLWESwitchingKeyPreparedToRef,
@@ -20,7 +20,7 @@ fn k(&self) -> TorusPrecision {
         self.0.k()
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.0.n()
     }
 

@@ -1,7 +1,7 @@
 use poulpy_hal::layouts::{Backend, Data, DataMut, DataRef, Module, Scratch};
 
 use crate::layouts::{
-    Base2K, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, LWEToGLWESwitchingKeyToRef, Rank, RingDegree, TorusPrecision,
+    Base2K, Degree, Dnum, Dsize, GGLWEInfos, GLWEInfos, LWEInfos, LWEToGLWESwitchingKeyToRef, Rank, TorusPrecision,
     prepared::{
         GLWESwitchingKeyPrepare, GLWESwitchingKeyPrepared, GLWESwitchingKeyPreparedAlloc, GLWESwitchingKeyPreparedToMut,
         GLWESwitchingKeyPreparedToRef,
@@ -21,7 +21,7 @@ fn k(&self) -> TorusPrecision {
         self.0.k()
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.0.n()
     }
 

@@ -25,4 +25,4 @@ pub use encryption::SIGMA;
 
 pub use scratch::*;
 
-// pub mod tests;
+pub mod tests;

@@ -1,182 +1,182 @@
-pub mod test_suite;
+// pub mod test_suite;
 
 #[cfg(test)]
 mod serialization;
 
-#[allow(unused_imports)]
-use poulpy_hal::backend_test_suite;
+//#[allow(unused_imports)]
+// use poulpy_hal::backend_test_suite;
 
-#[cfg(test)]
-backend_test_suite!(
-    mod cpu_spqlios,
-    backend = poulpy_backend::cpu_spqlios::FFT64Spqlios,
-    size = 1<<8,
-    tests = {
-        // GLWE Encryption
-        glwe_encrypt_sk => crate::tests::test_suite::encryption::test_glwe_encrypt_sk,
-        glwe_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_glwe_compressed_encrypt_sk,
-        glwe_encrypt_zero_sk => crate::tests::test_suite::encryption::test_glwe_encrypt_zero_sk,
-        glwe_encrypt_pk => crate::tests::test_suite::encryption::test_glwe_encrypt_pk,
-        // GLWE Keyswitch
-        glwe_keyswitch => crate::tests::test_suite::keyswitch::test_glwe_keyswitch,
-        glwe_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_glwe_keyswitch_inplace,
-        // GLWE Automorphism
-        glwe_automorphism => crate::tests::test_suite::automorphism::test_glwe_automorphism,
-        glwe_automorphism_inplace => crate::tests::test_suite::automorphism::test_glwe_automorphism_inplace,
-        // GLWE External Product
-        glwe_external_product => crate::tests::test_suite::external_product::test_glwe_external_product,
-        glwe_external_product_inplace => crate::tests::test_suite::external_product::test_glwe_external_product_inplace,
-        // GLWE Trace
-        glwe_trace_inplace => crate::tests::test_suite::test_glwe_trace_inplace,
-        glwe_packing => crate::tests::test_suite::test_glwe_packing,
-        // GGLWE Encryption
-        gglwe_switching_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_switching_key_encrypt_sk,
-        gglwe_switching_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_switching_key_compressed_encrypt_sk,
-        gglwe_automorphisk_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_automorphisk_key_encrypt_sk,
-        gglwe_automorphisk_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_automorphisk_key_compressed_encrypt_sk,
-        gglwe_tensor_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_tensor_key_encrypt_sk,
-        gglwe_tensor_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_tensor_key_compressed_encrypt_sk,
-        // GGLWE Keyswitching
-        gglwe_switching_key_keyswitch => crate::tests::test_suite::keyswitch::test_gglwe_switching_key_keyswitch,
-        gglwe_switching_key_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_gglwe_switching_key_keyswitch_inplace,
-        // GGLWE External Product
-        gglwe_switching_key_external_product => crate::tests::test_suite::external_product::test_gglwe_switching_key_external_product,
-        gglwe_switching_key_external_product_inplace => crate::tests::test_suite::external_product::test_gglwe_switching_key_external_product_inplace,
-        // GGLWE Automorphism
-        gglwe_automorphism_key_automorphism => crate::tests::test_suite::automorphism::test_gglwe_automorphism_key_automorphism,
-        gglwe_automorphism_key_automorphism_inplace => crate::tests::test_suite::automorphism::test_gglwe_automorphism_key_automorphism_inplace,
-        // GGSW Encryption
-        ggsw_encrypt_sk => crate::tests::test_suite::encryption::test_ggsw_encrypt_sk,
-        ggsw_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_ggsw_compressed_encrypt_sk,
-        // GGSW Keyswitching
-        ggsw_keyswitch => crate::tests::test_suite::keyswitch::test_ggsw_keyswitch,
-        ggsw_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_ggsw_keyswitch_inplace,
-        // GGSW External Product
-        ggsw_external_product => crate::tests::test_suite::external_product::test_ggsw_external_product,
-        ggsw_external_product_inplace => crate::tests::test_suite::external_product::test_ggsw_external_product_inplace,
-        // GGSW Automorphism
-        ggsw_automorphism => crate::tests::test_suite::automorphism::test_ggsw_automorphism,
-        ggsw_automorphism_inplace => crate::tests::test_suite::automorphism::test_ggsw_automorphism_inplace,
-        // LWE
-        lwe_keyswitch => crate::tests::test_suite::keyswitch::test_lwe_keyswitch,
-        glwe_to_lwe => crate::tests::test_suite::test_glwe_to_lwe,
-        lwe_to_glwe => crate::tests::test_suite::test_lwe_to_glwe,
-    }
-);
-
-#[cfg(test)]
-backend_test_suite!(
-    mod cpu_ref,
-    backend = poulpy_backend::cpu_fft64_ref::FFT64Ref,
-    size = 1<<8,
-    tests = {
-        // GLWE Encryption
-        glwe_encrypt_sk => crate::tests::test_suite::encryption::test_glwe_encrypt_sk,
-        glwe_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_glwe_compressed_encrypt_sk,
-        glwe_encrypt_zero_sk => crate::tests::test_suite::encryption::test_glwe_encrypt_zero_sk,
-        glwe_encrypt_pk => crate::tests::test_suite::encryption::test_glwe_encrypt_pk,
-        // GLWE Keyswitch
-        glwe_keyswitch => crate::tests::test_suite::keyswitch::test_glwe_keyswitch,
-        glwe_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_glwe_keyswitch_inplace,
-        // GLWE Automorphism
-        glwe_automorphism => crate::tests::test_suite::automorphism::test_glwe_automorphism,
-        glwe_automorphism_inplace => crate::tests::test_suite::automorphism::test_glwe_automorphism_inplace,
-        // GLWE External Product
-        glwe_external_product => crate::tests::test_suite::external_product::test_glwe_external_product,
-        glwe_external_product_inplace => crate::tests::test_suite::external_product::test_glwe_external_product_inplace,
-        // GLWE Trace
-        glwe_trace_inplace => crate::tests::test_suite::test_glwe_trace_inplace,
-        glwe_packing => crate::tests::test_suite::test_glwe_packing,
-        // GGLWE Encryption
-        gglwe_switching_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_switching_key_encrypt_sk,
-        gglwe_switching_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_switching_key_compressed_encrypt_sk,
-        gglwe_automorphisk_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_automorphisk_key_encrypt_sk,
-        gglwe_automorphisk_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_automorphisk_key_compressed_encrypt_sk,
-        gglwe_tensor_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_tensor_key_encrypt_sk,
-        gglwe_tensor_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_tensor_key_compressed_encrypt_sk,
-        // GGLWE Keyswitching
-        gglwe_switching_key_keyswitch => crate::tests::test_suite::keyswitch::test_gglwe_switching_key_keyswitch,
-        gglwe_switching_key_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_gglwe_switching_key_keyswitch_inplace,
-        // GGLWE External Product
-        gglwe_switching_key_external_product => crate::tests::test_suite::external_product::test_gglwe_switching_key_external_product,
-        gglwe_switching_key_external_product_inplace => crate::tests::test_suite::external_product::test_gglwe_switching_key_external_product_inplace,
-        // GGLWE Automorphism
-        gglwe_automorphism_key_automorphism => crate::tests::test_suite::automorphism::test_gglwe_automorphism_key_automorphism,
-        gglwe_automorphism_key_automorphism_inplace => crate::tests::test_suite::automorphism::test_gglwe_automorphism_key_automorphism_inplace,
-        // GGSW Encryption
-        ggsw_encrypt_sk => crate::tests::test_suite::encryption::test_ggsw_encrypt_sk,
-        ggsw_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_ggsw_compressed_encrypt_sk,
-        // GGSW Keyswitching
-        ggsw_keyswitch => crate::tests::test_suite::keyswitch::test_ggsw_keyswitch,
-        ggsw_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_ggsw_keyswitch_inplace,
-        // GGSW External Product
-        ggsw_external_product => crate::tests::test_suite::external_product::test_ggsw_external_product,
-        ggsw_external_product_inplace => crate::tests::test_suite::external_product::test_ggsw_external_product_inplace,
-        // GGSW Automorphism
-        ggsw_automorphism => crate::tests::test_suite::automorphism::test_ggsw_automorphism,
-        ggsw_automorphism_inplace => crate::tests::test_suite::automorphism::test_ggsw_automorphism_inplace,
-        // LWE
-        lwe_keyswitch => crate::tests::test_suite::keyswitch::test_lwe_keyswitch,
-        glwe_to_lwe => crate::tests::test_suite::test_glwe_to_lwe,
-        lwe_to_glwe => crate::tests::test_suite::test_lwe_to_glwe,
-    }
-);
-
-#[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
-#[cfg(test)]
-backend_test_suite!(
-    mod cpu_avx,
-    backend = poulpy_backend::cpu_fft64_avx::FFT64Avx,
-    size = 1<<8,
-    tests = {
-        // GLWE Encryption
-        glwe_encrypt_sk => crate::tests::test_suite::encryption::test_glwe_encrypt_sk,
-        glwe_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_glwe_compressed_encrypt_sk,
-        glwe_encrypt_zero_sk => crate::tests::test_suite::encryption::test_glwe_encrypt_zero_sk,
-        glwe_encrypt_pk => crate::tests::test_suite::encryption::test_glwe_encrypt_pk,
-        // GLWE Keyswitch
-        glwe_keyswitch => crate::tests::test_suite::keyswitch::test_glwe_keyswitch,
-        glwe_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_glwe_keyswitch_inplace,
-        // GLWE Automorphism
-        glwe_automorphism => crate::tests::test_suite::automorphism::test_glwe_automorphism,
-        glwe_automorphism_inplace => crate::tests::test_suite::automorphism::test_glwe_automorphism_inplace,
-        // GLWE External Product
-        glwe_external_product => crate::tests::test_suite::external_product::test_glwe_external_product,
-        glwe_external_product_inplace => crate::tests::test_suite::external_product::test_glwe_external_product_inplace,
-        // GLWE Trace
-        glwe_trace_inplace => crate::tests::test_suite::test_glwe_trace_inplace,
-        glwe_packing => crate::tests::test_suite::test_glwe_packing,
-        // GGLWE Encryption
-        gglwe_switching_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_switching_key_encrypt_sk,
-        gglwe_switching_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_switching_key_compressed_encrypt_sk,
-        gglwe_automorphisk_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_automorphisk_key_encrypt_sk,
-        gglwe_automorphisk_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_automorphisk_key_compressed_encrypt_sk,
-        gglwe_tensor_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_tensor_key_encrypt_sk,
-        gglwe_tensor_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_tensor_key_compressed_encrypt_sk,
-        // GGLWE Keyswitching
-        gglwe_switching_key_keyswitch => crate::tests::test_suite::keyswitch::test_gglwe_switching_key_keyswitch,
-        gglwe_switching_key_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_gglwe_switching_key_keyswitch_inplace,
-        // GGLWE External Product
-        gglwe_switching_key_external_product => crate::tests::test_suite::external_product::test_gglwe_switching_key_external_product,
-        gglwe_switching_key_external_product_inplace => crate::tests::test_suite::external_product::test_gglwe_switching_key_external_product_inplace,
-        // GGLWE Automorphism
-        gglwe_automorphism_key_automorphism => crate::tests::test_suite::automorphism::test_gglwe_automorphism_key_automorphism,
-        gglwe_automorphism_key_automorphism_inplace => crate::tests::test_suite::automorphism::test_gglwe_automorphism_key_automorphism_inplace,
-        // GGSW Encryption
-        ggsw_encrypt_sk => crate::tests::test_suite::encryption::test_ggsw_encrypt_sk,
-        ggsw_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_ggsw_compressed_encrypt_sk,
-        // GGSW Keyswitching
-        ggsw_keyswitch => crate::tests::test_suite::keyswitch::test_ggsw_keyswitch,
-        ggsw_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_ggsw_keyswitch_inplace,
-        // GGSW External Product
-        ggsw_external_product => crate::tests::test_suite::external_product::test_ggsw_external_product,
-        ggsw_external_product_inplace => crate::tests::test_suite::external_product::test_ggsw_external_product_inplace,
-        // GGSW Automorphism
-        ggsw_automorphism => crate::tests::test_suite::automorphism::test_ggsw_automorphism,
-        ggsw_automorphism_inplace => crate::tests::test_suite::automorphism::test_ggsw_automorphism_inplace,
-        // LWE
-        lwe_keyswitch => crate::tests::test_suite::keyswitch::test_lwe_keyswitch,
-        glwe_to_lwe => crate::tests::test_suite::test_glwe_to_lwe,
-        lwe_to_glwe => crate::tests::test_suite::test_lwe_to_glwe,
-    }
-);
+// #[cfg(test)]
+// backend_test_suite!(
+// mod cpu_spqlios,
+// backend = poulpy_backend::cpu_spqlios::FFT64Spqlios,
+// size = 1<<8,
+// tests = {
+// GLWE Encryption
+// glwe_encrypt_sk => crate::tests::test_suite::encryption::test_glwe_encrypt_sk,
+// glwe_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_glwe_compressed_encrypt_sk,
+// glwe_encrypt_zero_sk => crate::tests::test_suite::encryption::test_glwe_encrypt_zero_sk,
+// glwe_encrypt_pk => crate::tests::test_suite::encryption::test_glwe_encrypt_pk,
+// GLWE Keyswitch
+// glwe_keyswitch => crate::tests::test_suite::keyswitch::test_glwe_keyswitch,
+// glwe_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_glwe_keyswitch_inplace,
+// GLWE Automorphism
+// glwe_automorphism => crate::tests::test_suite::automorphism::test_glwe_automorphism,
+// glwe_automorphism_inplace => crate::tests::test_suite::automorphism::test_glwe_automorphism_inplace,
+// GLWE External Product
+// glwe_external_product => crate::tests::test_suite::external_product::test_glwe_external_product,
+// glwe_external_product_inplace => crate::tests::test_suite::external_product::test_glwe_external_product_inplace,
+// GLWE Trace
+// glwe_trace_inplace => crate::tests::test_suite::test_glwe_trace_inplace,
+// glwe_packing => crate::tests::test_suite::test_glwe_packing,
+// GGLWE Encryption
+// gglwe_switching_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_switching_key_encrypt_sk,
+// gglwe_switching_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_switching_key_compressed_encrypt_sk,
+// gglwe_automorphisk_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_automorphisk_key_encrypt_sk,
+// gglwe_automorphisk_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_automorphisk_key_compressed_encrypt_sk,
+// gglwe_tensor_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_tensor_key_encrypt_sk,
+// gglwe_tensor_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_tensor_key_compressed_encrypt_sk,
+// GGLWE Keyswitching
+// gglwe_switching_key_keyswitch => crate::tests::test_suite::keyswitch::test_gglwe_switching_key_keyswitch,
+// gglwe_switching_key_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_gglwe_switching_key_keyswitch_inplace,
+// GGLWE External Product
+// gglwe_switching_key_external_product => crate::tests::test_suite::external_product::test_gglwe_switching_key_external_product,
+// gglwe_switching_key_external_product_inplace => crate::tests::test_suite::external_product::test_gglwe_switching_key_external_product_inplace,
+// GGLWE Automorphism
+// gglwe_automorphism_key_automorphism => crate::tests::test_suite::automorphism::test_gglwe_automorphism_key_automorphism,
+// gglwe_automorphism_key_automorphism_inplace => crate::tests::test_suite::automorphism::test_gglwe_automorphism_key_automorphism_inplace,
+// GGSW Encryption
+// ggsw_encrypt_sk => crate::tests::test_suite::encryption::test_ggsw_encrypt_sk,
+// ggsw_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_ggsw_compressed_encrypt_sk,
+// GGSW Keyswitching
+// ggsw_keyswitch => crate::tests::test_suite::keyswitch::test_ggsw_keyswitch,
+// ggsw_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_ggsw_keyswitch_inplace,
+// GGSW External Product
+// ggsw_external_product => crate::tests::test_suite::external_product::test_ggsw_external_product,
+// ggsw_external_product_inplace => crate::tests::test_suite::external_product::test_ggsw_external_product_inplace,
+// GGSW Automorphism
+// ggsw_automorphism => crate::tests::test_suite::automorphism::test_ggsw_automorphism,
+// ggsw_automorphism_inplace => crate::tests::test_suite::automorphism::test_ggsw_automorphism_inplace,
+// LWE
+// lwe_keyswitch => crate::tests::test_suite::keyswitch::test_lwe_keyswitch,
+// glwe_to_lwe => crate::tests::test_suite::test_glwe_to_lwe,
+// lwe_to_glwe => crate::tests::test_suite::test_lwe_to_glwe,
+// }
+// );
+//
+// #[cfg(test)]
+// backend_test_suite!(
+// mod cpu_ref,
+// backend = poulpy_backend::cpu_fft64_ref::FFT64Ref,
+// size = 1<<8,
+// tests = {
+// GLWE Encryption
+// glwe_encrypt_sk => crate::tests::test_suite::encryption::test_glwe_encrypt_sk,
+// glwe_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_glwe_compressed_encrypt_sk,
+// glwe_encrypt_zero_sk => crate::tests::test_suite::encryption::test_glwe_encrypt_zero_sk,
+// glwe_encrypt_pk => crate::tests::test_suite::encryption::test_glwe_encrypt_pk,
+// GLWE Keyswitch
+// glwe_keyswitch => crate::tests::test_suite::keyswitch::test_glwe_keyswitch,
+// glwe_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_glwe_keyswitch_inplace,
+// GLWE Automorphism
+// glwe_automorphism => crate::tests::test_suite::automorphism::test_glwe_automorphism,
+// glwe_automorphism_inplace => crate::tests::test_suite::automorphism::test_glwe_automorphism_inplace,
+// GLWE External Product
+// glwe_external_product => crate::tests::test_suite::external_product::test_glwe_external_product,
+// glwe_external_product_inplace => crate::tests::test_suite::external_product::test_glwe_external_product_inplace,
+// GLWE Trace
+// glwe_trace_inplace => crate::tests::test_suite::test_glwe_trace_inplace,
+// glwe_packing => crate::tests::test_suite::test_glwe_packing,
+// GGLWE Encryption
+// gglwe_switching_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_switching_key_encrypt_sk,
+// gglwe_switching_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_switching_key_compressed_encrypt_sk,
+// gglwe_automorphisk_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_automorphisk_key_encrypt_sk,
+// gglwe_automorphisk_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_automorphisk_key_compressed_encrypt_sk,
+// gglwe_tensor_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_tensor_key_encrypt_sk,
+// gglwe_tensor_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_tensor_key_compressed_encrypt_sk,
+// GGLWE Keyswitching
+// gglwe_switching_key_keyswitch => crate::tests::test_suite::keyswitch::test_gglwe_switching_key_keyswitch,
+// gglwe_switching_key_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_gglwe_switching_key_keyswitch_inplace,
+// GGLWE External Product
+// gglwe_switching_key_external_product => crate::tests::test_suite::external_product::test_gglwe_switching_key_external_product,
+// gglwe_switching_key_external_product_inplace => crate::tests::test_suite::external_product::test_gglwe_switching_key_external_product_inplace,
+// GGLWE Automorphism
+// gglwe_automorphism_key_automorphism => crate::tests::test_suite::automorphism::test_gglwe_automorphism_key_automorphism,
+// gglwe_automorphism_key_automorphism_inplace => crate::tests::test_suite::automorphism::test_gglwe_automorphism_key_automorphism_inplace,
+// GGSW Encryption
+// ggsw_encrypt_sk => crate::tests::test_suite::encryption::test_ggsw_encrypt_sk,
+// ggsw_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_ggsw_compressed_encrypt_sk,
+// GGSW Keyswitching
+// ggsw_keyswitch => crate::tests::test_suite::keyswitch::test_ggsw_keyswitch,
+// ggsw_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_ggsw_keyswitch_inplace,
+// GGSW External Product
+// ggsw_external_product => crate::tests::test_suite::external_product::test_ggsw_external_product,
+// ggsw_external_product_inplace => crate::tests::test_suite::external_product::test_ggsw_external_product_inplace,
+// GGSW Automorphism
+// ggsw_automorphism => crate::tests::test_suite::automorphism::test_ggsw_automorphism,
+// ggsw_automorphism_inplace => crate::tests::test_suite::automorphism::test_ggsw_automorphism_inplace,
+// LWE
+// lwe_keyswitch => crate::tests::test_suite::keyswitch::test_lwe_keyswitch,
+// glwe_to_lwe => crate::tests::test_suite::test_glwe_to_lwe,
+// lwe_to_glwe => crate::tests::test_suite::test_lwe_to_glwe,
+// }
+// );
+//
+// #[cfg(any(target_arch = "x86_64", target_arch = "x86"))]
+// #[cfg(test)]
+// backend_test_suite!(
+// mod cpu_avx,
+// backend = poulpy_backend::cpu_fft64_avx::FFT64Avx,
+// size = 1<<8,
+// tests = {
+// GLWE Encryption
+// glwe_encrypt_sk => crate::tests::test_suite::encryption::test_glwe_encrypt_sk,
+// glwe_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_glwe_compressed_encrypt_sk,
+// glwe_encrypt_zero_sk => crate::tests::test_suite::encryption::test_glwe_encrypt_zero_sk,
+// glwe_encrypt_pk => crate::tests::test_suite::encryption::test_glwe_encrypt_pk,
+// GLWE Keyswitch
+// glwe_keyswitch => crate::tests::test_suite::keyswitch::test_glwe_keyswitch,
+// glwe_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_glwe_keyswitch_inplace,
+// GLWE Automorphism
+// glwe_automorphism => crate::tests::test_suite::automorphism::test_glwe_automorphism,
+// glwe_automorphism_inplace => crate::tests::test_suite::automorphism::test_glwe_automorphism_inplace,
+// GLWE External Product
+// glwe_external_product => crate::tests::test_suite::external_product::test_glwe_external_product,
+// glwe_external_product_inplace => crate::tests::test_suite::external_product::test_glwe_external_product_inplace,
+// GLWE Trace
+// glwe_trace_inplace => crate::tests::test_suite::test_glwe_trace_inplace,
+// glwe_packing => crate::tests::test_suite::test_glwe_packing,
+// GGLWE Encryption
+// gglwe_switching_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_switching_key_encrypt_sk,
+// gglwe_switching_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_switching_key_compressed_encrypt_sk,
+// gglwe_automorphisk_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_automorphisk_key_encrypt_sk,
+// gglwe_automorphisk_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_automorphisk_key_compressed_encrypt_sk,
+// gglwe_tensor_key_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_tensor_key_encrypt_sk,
+// gglwe_tensor_key_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_gglwe_tensor_key_compressed_encrypt_sk,
+// GGLWE Keyswitching
+// gglwe_switching_key_keyswitch => crate::tests::test_suite::keyswitch::test_gglwe_switching_key_keyswitch,
+// gglwe_switching_key_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_gglwe_switching_key_keyswitch_inplace,
+// GGLWE External Product
+// gglwe_switching_key_external_product => crate::tests::test_suite::external_product::test_gglwe_switching_key_external_product,
+// gglwe_switching_key_external_product_inplace => crate::tests::test_suite::external_product::test_gglwe_switching_key_external_product_inplace,
+// GGLWE Automorphism
+// gglwe_automorphism_key_automorphism => crate::tests::test_suite::automorphism::test_gglwe_automorphism_key_automorphism,
+// gglwe_automorphism_key_automorphism_inplace => crate::tests::test_suite::automorphism::test_gglwe_automorphism_key_automorphism_inplace,
+// GGSW Encryption
+// ggsw_encrypt_sk => crate::tests::test_suite::encryption::test_ggsw_encrypt_sk,
+// ggsw_compressed_encrypt_sk => crate::tests::test_suite::encryption::test_ggsw_compressed_encrypt_sk,
+// GGSW Keyswitching
+// ggsw_keyswitch => crate::tests::test_suite::keyswitch::test_ggsw_keyswitch,
+// ggsw_keyswitch_inplace => crate::tests::test_suite::keyswitch::test_ggsw_keyswitch_inplace,
+// GGSW External Product
+// ggsw_external_product => crate::tests::test_suite::external_product::test_ggsw_external_product,
+// ggsw_external_product_inplace => crate::tests::test_suite::external_product::test_ggsw_external_product_inplace,
+// GGSW Automorphism
+// ggsw_automorphism => crate::tests::test_suite::automorphism::test_ggsw_automorphism,
+// ggsw_automorphism_inplace => crate::tests::test_suite::automorphism::test_ggsw_automorphism_inplace,
+// LWE
+// lwe_keyswitch => crate::tests::test_suite::keyswitch::test_lwe_keyswitch,
+// glwe_to_lwe => crate::tests::test_suite::test_glwe_to_lwe,
+// lwe_to_glwe => crate::tests::test_suite::test_lwe_to_glwe,
+// }
+// );

@@ -1,4 +1,5 @@
-use poulpy_hal::test_suite::serialization::test_reader_writer_interface;
+use poulpy_backend::FFT64Ref;
+use poulpy_hal::{api::ModuleNew, layouts::Module, test_suite::serialization::test_reader_writer_interface};
 
 use crate::layouts::{
     AutomorphismKey, Base2K, Degree, Dnum, Dsize, GGLWE, GGSW, GLWE, GLWESwitchingKey, GLWEToLWESwitchingKey, LWE,
@@ -20,123 +21,143 @@ const DSIZE: Dsize = Dsize(1);
 
 #[test]
 fn glwe_serialization() {
-    let original: GLWE<Vec<u8>> = GLWE::alloc(N_GLWE, BASE2K, K, RANK);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: GLWE<Vec<u8>> = GLWE::alloc(&module, BASE2K, K, RANK);
     poulpy_hal::test_suite::serialization::test_reader_writer_interface(original);
 }
 
 #[test]
 fn glwe_compressed_serialization() {
-    let original: GLWECompressed<Vec<u8>> = GLWECompressed::alloc(N_GLWE, BASE2K, K, RANK);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: GLWECompressed<Vec<u8>> = GLWECompressed::alloc(&module, BASE2K, K, RANK);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn lwe_serialization() {
-    let original: LWE<Vec<u8>> = LWE::alloc(N_LWE, BASE2K, K);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: LWE<Vec<u8>> = LWE::alloc(&module, N_LWE, BASE2K, K);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn lwe_compressed_serialization() {
-    let original: LWECompressed<Vec<u8>> = LWECompressed::alloc(BASE2K, K);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: LWECompressed<Vec<u8>> = LWECompressed::alloc(&module, BASE2K, K);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn test_gglwe_serialization() {
-    let original: GGLWE<Vec<u8>> = GGLWE::alloc(N_GLWE, BASE2K, K, RANK, RANK, DNUM, DSIZE);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: GGLWE<Vec<u8>> = GGLWE::alloc(&module, BASE2K, K, RANK, RANK, DNUM, DSIZE);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn test_gglwe_compressed_serialization() {
-    let original: GGLWECompressed<Vec<u8>> = GGLWECompressed::alloc(N_GLWE, BASE2K, K, RANK, RANK, DNUM, DSIZE);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: GGLWECompressed<Vec<u8>> = GGLWECompressed::alloc(&module, BASE2K, K, RANK, RANK, DNUM, DSIZE);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn test_glwe_switching_key_serialization() {
-    let original: GLWESwitchingKey<Vec<u8>> = GLWESwitchingKey::alloc(N_GLWE, BASE2K, K, RANK, RANK, DNUM, DSIZE);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: GLWESwitchingKey<Vec<u8>> = GLWESwitchingKey::alloc(&module, BASE2K, K, RANK, RANK, DNUM, DSIZE);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn test_glwe_switching_key_compressed_serialization() {
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
     let original: GLWESwitchingKeyCompressed<Vec<u8>> =
-        GLWESwitchingKeyCompressed::alloc(N_GLWE, BASE2K, K, RANK, RANK, DNUM, DSIZE);
+        GLWESwitchingKeyCompressed::alloc(&module, BASE2K, K, RANK, RANK, DNUM, DSIZE);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn test_automorphism_key_serialization() {
-    let original: AutomorphismKey<Vec<u8>> = AutomorphismKey::alloc_with(N_GLWE, BASE2K, K, RANK, DNUM, DSIZE);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: AutomorphismKey<Vec<u8>> = AutomorphismKey::alloc_with(&module, BASE2K, K, RANK, DNUM, DSIZE);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn test_automorphism_key_compressed_serialization() {
-    let original: AutomorphismKeyCompressed<Vec<u8>> = AutomorphismKeyCompressed::alloc(N_GLWE, BASE2K, K, RANK, DNUM, DSIZE);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: AutomorphismKeyCompressed<Vec<u8>> = AutomorphismKeyCompressed::alloc(&module, BASE2K, K, RANK, DNUM, DSIZE);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn test_tensor_key_serialization() {
-    let original: TensorKey<Vec<u8>> = TensorKey::alloc(N_GLWE, BASE2K, K, RANK, DNUM, DSIZE);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: TensorKey<Vec<u8>> = TensorKey::alloc(&module, BASE2K, K, RANK, DNUM, DSIZE);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn test_tensor_key_compressed_serialization() {
-    let original: TensorKeyCompressed<Vec<u8>> = TensorKeyCompressed::alloc(N_GLWE, BASE2K, K, RANK, DNUM, DSIZE);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: TensorKeyCompressed<Vec<u8>> = TensorKeyCompressed::alloc(&module, BASE2K, K, RANK, DNUM, DSIZE);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn glwe_to_lwe_switching_key_serialization() {
-    let original: GLWEToLWESwitchingKey<Vec<u8>> = GLWEToLWESwitchingKey::alloc(N_GLWE, BASE2K, K, RANK, DNUM);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: GLWEToLWESwitchingKey<Vec<u8>> = GLWEToLWESwitchingKey::alloc(&module, BASE2K, K, RANK, DNUM);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn glwe_to_lwe_switching_key_compressed_serialization() {
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
     let original: GLWEToLWESwitchingKeyCompressed<Vec<u8>> =
-        GLWEToLWESwitchingKeyCompressed::alloc(N_GLWE, BASE2K, K, RANK, DNUM);
+        GLWEToLWESwitchingKeyCompressed::alloc(&module, BASE2K, K, RANK, DNUM);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn lwe_to_glwe_switching_key_serialization() {
-    let original: LWEToGLWESwitchingKey<Vec<u8>> = LWEToGLWESwitchingKey::alloc(N_GLWE, BASE2K, K, RANK, DNUM);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: LWEToGLWESwitchingKey<Vec<u8>> = LWEToGLWESwitchingKey::alloc(&module, BASE2K, K, RANK, DNUM);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn lwe_to_glwe_switching_key_compressed_serialization() {
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
     let original: LWEToGLWESwitchingKeyCompressed<Vec<u8>> =
-        LWEToGLWESwitchingKeyCompressed::alloc_with(N_GLWE, BASE2K, K, RANK, DNUM);
+        LWEToGLWESwitchingKeyCompressed::alloc_with(&module, BASE2K, K, RANK, DNUM);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn lwe_switching_key_serialization() {
-    let original: LWESwitchingKey<Vec<u8>> = LWESwitchingKey::alloc(N_GLWE, BASE2K, K, DNUM);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: LWESwitchingKey<Vec<u8>> = LWESwitchingKey::alloc(&module, BASE2K, K, DNUM);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn lwe_switching_key_compressed_serialization() {
-    let original: LWESwitchingKeyCompressed<Vec<u8>> = LWESwitchingKeyCompressed::alloc(N_GLWE, BASE2K, K, DNUM);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: LWESwitchingKeyCompressed<Vec<u8>> = LWESwitchingKeyCompressed::alloc(&module, BASE2K, K, DNUM);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn ggsw_serialization() {
-    let original: GGSW<Vec<u8>> = GGSW::alloc(N_GLWE, BASE2K, K, RANK, DNUM, DSIZE);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: GGSW<Vec<u8>> = GGSW::alloc(&module, BASE2K, K, RANK, DNUM, DSIZE);
     test_reader_writer_interface(original);
 }
 
 #[test]
 fn ggsw_compressed_serialization() {
-    let original: GGSWCompressed<Vec<u8>> = GGSWCompressed::alloc(N_GLWE, BASE2K, K, RANK, DNUM, DSIZE);
+    let module: Module<FFT64Ref> = Module::<FFT64Ref>::new(N_GLWE.as_u32() as u64);
+    let original: GGSWCompressed<Vec<u8>> = GGSWCompressed::alloc(&module, BASE2K, K, RANK, DNUM, DSIZE);
     test_reader_writer_interface(original);
 }

@@ -188,8 +188,8 @@ {
         // Scratch space (4MB)
         let mut scratch: ScratchOwned<B> = ScratchOwned::alloc(1 << 22);
 
-        let n_glwe: poulpy_core::layouts::RingDegree = params.cbt_infos.layout_brk.n_glwe();
-        let n_lwe: poulpy_core::layouts::RingDegree = params.cbt_infos.layout_brk.n_lwe();
+        let n_glwe: poulpy_core::layouts::Degree = params.cbt_infos.layout_brk.n_glwe();
+        let n_lwe: poulpy_core::layouts::Degree = params.cbt_infos.layout_brk.n_lwe();
         let rank: poulpy_core::layouts::Rank = params.cbt_infos.layout_brk.rank;
 
         let module: Module<B> = Module::<B>::new(n_glwe.as_u32() as u64);

@@ -38,7 +38,7 @@ fn k(&self) -> poulpy_core::layouts::TorusPrecision {
         self.blocks[0].k()
     }
 
-    fn n(&self) -> poulpy_core::layouts::RingDegree {
+    fn n(&self) -> poulpy_core::layouts::Degree {
         self.blocks[0].n()
     }
 }

@@ -225,7 +225,7 @@ fn k(&self) -> poulpy_core::layouts::TorusPrecision {
         self.blocks[0].k()
     }
 
-    fn n(&self) -> poulpy_core::layouts::RingDegree {
+    fn n(&self) -> poulpy_core::layouts::Degree {
         self.blocks[0].n()
     }
 }
@@ -256,7 +256,7 @@ fn k(&self) -> poulpy_core::layouts::TorusPrecision {
         self.blocks[0].k()
     }
 
-    fn n(&self) -> poulpy_core::layouts::RingDegree {
+    fn n(&self) -> poulpy_core::layouts::Degree {
         self.blocks[0].n()
     }
 }

@@ -87,7 +87,7 @@ fn k(&self) -> poulpy_core::layouts::TorusPrecision {
         self.0.k()
     }
 
-    fn n(&self) -> poulpy_core::layouts::RingDegree {
+    fn n(&self) -> poulpy_core::layouts::Degree {
         self.0.n()
     }
 }

@@ -1,6 +1,6 @@
 #[cfg(test)]
 use poulpy_core::layouts::{
-    AutomorphismKeyLayout, Base2K, Dnum, Dsize, GGSWLayout, GLWELayout, GLWEToLWEKeyLayout, Rank, RingDegree, TensorKeyLayout,
+    AutomorphismKeyLayout, Base2K, Degree, Dnum, Dsize, GGSWLayout, GLWELayout, GLWEToLWEKeyLayout, Rank, TensorKeyLayout,
     TorusPrecision,
 };
 
@@ -26,7 +26,7 @@ pub(crate) const TEST_RANK: u32 = 2;
 
 #[cfg(test)]
 pub(crate) static TEST_GLWE_INFOS: GLWELayout = GLWELayout {
-    n: RingDegree(TEST_N_GLWE),
+    n: Degree(TEST_N_GLWE),
     base2k: Base2K(TEST_BASE2K),
     k: TorusPrecision(TEST_K_GLWE),
     rank: Rank(TEST_RANK),
@@ -34,7 +34,7 @@ };
 
 #[cfg(test)]
 pub(crate) static TEST_GGSW_INFOS: GGSWLayout = GGSWLayout {
-    n: RingDegree(TEST_N_GLWE),
+    n: Degree(TEST_N_GLWE),
     base2k: Base2K(TEST_BASE2K),
     k: TorusPrecision(TEST_K_GGSW),
     rank: Rank(TEST_RANK),
@@ -46,15 +46,15 @@ #[cfg(test)]
 pub(crate) static TEST_BDD_KEY_LAYOUT: BDDKeyLayout = BDDKeyLayout {
     cbt: CircuitBootstrappingKeyLayout {
         layout_brk: BlindRotationKeyLayout {
-            n_glwe: RingDegree(TEST_N_GLWE),
-            n_lwe: RingDegree(TEST_N_LWE),
+            n_glwe: Degree(TEST_N_GLWE),
+            n_lwe: Degree(TEST_N_LWE),
             base2k: Base2K(TEST_BASE2K),
             k: TorusPrecision(52),
             dnum: Dnum(3),
             rank: Rank(TEST_RANK),
         },
         layout_atk: AutomorphismKeyLayout {
-            n: RingDegree(TEST_N_GLWE),
+            n: Degree(TEST_N_GLWE),
             base2k: Base2K(TEST_BASE2K),
             k: TorusPrecision(52),
             rank: Rank(TEST_RANK),
@@ -62,7 +62,7 @@ dnum: Dnum(3),
             dsize: Dsize(1),
         },
         layout_tsk: TensorKeyLayout {
-            n: RingDegree(TEST_N_GLWE),
+            n: Degree(TEST_N_GLWE),
             base2k: Base2K(TEST_BASE2K),
             k: TorusPrecision(52),
             rank: Rank(TEST_RANK),
@@ -71,7 +71,7 @@ dsize: Dsize(1),
         },
     },
     ks: GLWEToLWEKeyLayout {
-        n: RingDegree(TEST_N_GLWE),
+        n: Degree(TEST_N_GLWE),
         base2k: Base2K(TEST_BASE2K),
         k: TorusPrecision(39),
         rank_in: Rank(TEST_RANK),

@@ -8,7 +8,7 @@
 use poulpy_core::{
     Distribution,
     layouts::{
-        Base2K, Dnum, Dsize, GGSW, GGSWInfos, GLWEInfos, LWEInfos, LWESecret, Rank, RingDegree, TorusPrecision,
+        Base2K, Degree, Dnum, Dsize, GGSW, GGSWInfos, GLWEInfos, LWEInfos, LWESecret, Rank, TorusPrecision,
         prepared::GLWESecretPrepared,
     },
 };
@@ -19,8 +19,8 @@ use crate::tfhe::blind_rotation::BlindRotationAlgo;
 
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct BlindRotationKeyLayout {
-    pub n_glwe: RingDegree,
-    pub n_lwe: RingDegree,
+    pub n_glwe: Degree,
+    pub n_lwe: Degree,
     pub base2k: Base2K,
     pub k: TorusPrecision,
     pub dnum: Dnum,
@@ -28,11 +28,11 @@ pub rank: Rank,
 }
 
 impl BlindRotationKeyInfos for BlindRotationKeyLayout {
-    fn n_glwe(&self) -> RingDegree {
+    fn n_glwe(&self) -> Degree {
         self.n_glwe
     }
 
-    fn n_lwe(&self) -> RingDegree {
+    fn n_lwe(&self) -> Degree {
         self.n_lwe
     }
 }
@@ -62,7 +62,7 @@ fn k(&self) -> TorusPrecision {
         self.k
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.n_glwe
     }
 }
@@ -71,8 +71,8 @@ pub trait BlindRotationKeyInfos
 where
     Self: GGSWInfos,
 {
-    fn n_glwe(&self) -> RingDegree;
-    fn n_lwe(&self) -> RingDegree;
+    fn n_glwe(&self) -> Degree;
+    fn n_lwe(&self) -> Degree;
 }
 
 pub trait BlindRotationKeyAlloc {
@@ -178,12 +178,12 @@ }
 }
 
 impl<D: DataRef, BRT: BlindRotationAlgo> BlindRotationKeyInfos for BlindRotationKey<D, BRT> {
-    fn n_glwe(&self) -> RingDegree {
+    fn n_glwe(&self) -> Degree {
         self.n()
     }
 
-    fn n_lwe(&self) -> RingDegree {
-        RingDegree(self.keys.len() as u32)
+    fn n_lwe(&self) -> Degree {
+        Degree(self.keys.len() as u32)
     }
 }
 
@@ -206,7 +206,7 @@ fn k(&self) -> TorusPrecision {
         self.keys[0].k()
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.keys[0].n()
     }
 

@@ -8,7 +8,7 @@
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 use poulpy_core::{
     Distribution,
-    layouts::{Base2K, Dsize, GGSWInfos, GLWEInfos, LWEInfos, RingDegree, TorusPrecision, compressed::GGSWCompressed},
+    layouts::{Base2K, Degree, Dsize, GGSWInfos, GLWEInfos, LWEInfos, TorusPrecision, compressed::GGSWCompressed},
 };
 
 use crate::tfhe::blind_rotation::{BlindRotationAlgo, BlindRotationKeyInfos};
@@ -94,17 +94,17 @@ }
 }
 
 impl<D: DataRef, BRA: BlindRotationAlgo> BlindRotationKeyInfos for BlindRotationKeyCompressed<D, BRA> {
-    fn n_glwe(&self) -> RingDegree {
+    fn n_glwe(&self) -> Degree {
         self.n()
     }
 
-    fn n_lwe(&self) -> RingDegree {
-        RingDegree(self.keys.len() as u32)
+    fn n_lwe(&self) -> Degree {
+        Degree(self.keys.len() as u32)
     }
 }
 
 impl<D: DataRef, BRA: BlindRotationAlgo> LWEInfos for BlindRotationKeyCompressed<D, BRA> {
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.keys[0].n()
     }
 

@@ -8,7 +8,7 @@
 use poulpy_core::{
     Distribution,
     layouts::{
-        Base2K, Dnum, Dsize, GGSWInfos, GLWEInfos, LWEInfos, Rank, RingDegree, TorusPrecision,
+        Base2K, Degree, Dnum, Dsize, GGSWInfos, GLWEInfos, LWEInfos, Rank, TorusPrecision,
         prepared::{GGSWPrepared, Prepare, PrepareAlloc},
     },
 };
@@ -30,12 +30,12 @@ pub(crate) _phantom: PhantomData<BRT>,
 }
 
 impl<D: Data, BRT: BlindRotationAlgo, B: Backend> BlindRotationKeyInfos for BlindRotationKeyPrepared<D, BRT, B> {
-    fn n_glwe(&self) -> RingDegree {
+    fn n_glwe(&self) -> Degree {
         self.n()
     }
 
-    fn n_lwe(&self) -> RingDegree {
-        RingDegree(self.data.len() as u32)
+    fn n_lwe(&self) -> Degree {
+        Degree(self.data.len() as u32)
     }
 }
 
@@ -48,7 +48,7 @@ fn k(&self) -> TorusPrecision {
         self.data[0].k()
     }
 
-    fn n(&self) -> RingDegree {
+    fn n(&self) -> Degree {
         self.data[0].n()
     }