diff --git a/Cargo.lock b/Cargo.lock
index 16ade51..ff156b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -39,9 +39,9 @@ checksum = "89af0b093cc13baa4e51e64e65ec2422f7e73aea0e612e5ad3872986671622f1"
 
 [[package]]
 name = "block-buffer"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96eb4cdd6cf1b31d671e9efe75c5d1ec614776856cefbe109ca373554a6d514f"
+checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be"
 dependencies = [
  "hybrid-array",
  "zeroize",
@@ -86,15 +86,15 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "cipher"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64727038c8c5e2bb503a15b9f5b9df50a1da9a33e83e1f93067d914f2c6604a5"
+checksum = "e34d8227fe1ba289043aeb13792056ff80fd6de1a9f49137a5f499de8e8c78ea"
 dependencies = [
  "blobby",
  "block-buffer",
@@ -105,9 +105,9 @@ dependencies = [
 
 [[package]]
 name = "cpubits"
-version = "0.1.0-rc.3"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a8c0210fa48ba3ea04ac1e9c6e72ae66009db3b1f1745635d4ff2e58eaadd0"
+checksum = "5ef0c543070d296ea414df2dd7625d1b24866ce206709d8a4a424f28377f5861"
 
 [[package]]
 name = "cpufeatures"
@@ -120,9 +120,9 @@ dependencies = [
 
 [[package]]
 name = "crypto-common"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "211f05e03c7d03754740fd9e585de910a095d6b99f8bcfffdef8319fa02a8331"
+checksum = "77727bb15fa921304124b128af125e7e3b968275d1b108b379190264f4423710"
 dependencies = [
  "hybrid-array",
 ]
@@ -150,9 +150,9 @@ dependencies = [
 
 [[package]]
 name = "hex-literal"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcaaec4551594c969335c98c903c1397853d4198408ea609190f420500f6be71"
+checksum = "e712f64ec3850b98572bffac52e2c6f282b29fe6c5fa6d42334b30be438d95c1"
 
 [[package]]
 name = "hybrid-array"
@@ -195,9 +195,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.175"
+version = "0.2.182"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
 
 [[package]]
 name = "magma"
@@ -228,12 +228,12 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
diff --git a/cbc/src/decrypt.rs b/cbc/src/decrypt.rs
index 664dbca..5d3d090 100644
--- a/cbc/src/decrypt.rs
+++ b/cbc/src/decrypt.rs
@@ -3,8 +3,8 @@ use cipher::{
     AlgorithmName, Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt,
     BlockModeDecBackend, BlockModeDecClosure, BlockModeDecrypt, BlockSizeUser, InnerIvInit, Iv,
     IvState, ParBlocks, ParBlocksSizeUser,
-    array::Array,
-    common::{BlockSizes, InnerUser, IvSizeUser},
+    array::{Array, ArraySize},
+    common::{InnerUser, IvSizeUser},
     inout::InOut,
 };
 use core::fmt;
@@ -35,7 +35,7 @@ where
     fn decrypt_with_backend(&mut self, f: impl BlockModeDecClosure<BlockSize = Self::BlockSize>) {
         struct Closure<'a, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = BS>,
         {
             iv: &'a mut Array<u8, BS>,
@@ -44,7 +44,7 @@ where
 
         impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = BS>,
         {
             type BlockSize = BS;
@@ -52,7 +52,7 @@ where
 
         impl<BS, BC> BlockCipherDecClosure for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = BS>,
         {
             #[inline(always)]
@@ -141,7 +141,7 @@ impl<C: BlockCipherDecrypt + ZeroizeOnDrop> ZeroizeOnDrop for Decryptor<C> {}
 
 struct Backend<'a, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherDecBackend<BlockSize = BS>,
 {
     iv: &'a mut Array<u8, BS>,
@@ -150,7 +150,7 @@ where
 
 impl<BS, BK> BlockSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherDecBackend<BlockSize = BS>,
 {
     type BlockSize = BS;
@@ -158,7 +158,7 @@ where
 
 impl<BS, BK> ParBlocksSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherDecBackend<BlockSize = BS>,
 {
     type ParBlocksSize = BK::ParBlocksSize;
@@ -166,7 +166,7 @@ where
 
 impl<BS, BK> BlockModeDecBackend for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherDecBackend<BlockSize = BS>,
 {
     #[inline(always)]
diff --git a/cbc/src/encrypt.rs b/cbc/src/encrypt.rs
index 01dc6ee..3a12b52 100644
--- a/cbc/src/encrypt.rs
+++ b/cbc/src/encrypt.rs
@@ -2,9 +2,7 @@ use crate::xor;
 use cipher::{
     AlgorithmName, Array, Block, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt,
     BlockModeEncBackend, BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser, InOut, InnerIvInit,
-    Iv, IvSizeUser, IvState, ParBlocksSizeUser,
-    common::{BlockSizes, InnerUser},
-    consts::U1,
+    Iv, IvSizeUser, IvState, ParBlocksSizeUser, array::ArraySize, common::InnerUser, consts::U1,
 };
 use core::fmt;
 
@@ -71,7 +69,7 @@ where
     fn encrypt_with_backend(&mut self, f: impl BlockModeEncClosure<BlockSize = Self::BlockSize>) {
         struct Closure<'a, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = BS>,
         {
             iv: &'a mut Array<u8, BS>,
@@ -80,7 +78,7 @@ where
 
         impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = BS>,
         {
             type BlockSize = BS;
@@ -88,7 +86,7 @@ where
 
         impl<BS, BC> BlockCipherEncClosure for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = BS>,
         {
             #[inline(always)]
@@ -140,7 +138,7 @@ impl<C: BlockCipherEncrypt + ZeroizeOnDrop> ZeroizeOnDrop for Encryptor<C> {}
 
 struct Backend<'a, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     iv: &'a mut Array<u8, BS>,
@@ -149,7 +147,7 @@ where
 
 impl<BS, BK> BlockSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type BlockSize = BS;
@@ -157,7 +155,7 @@ where
 
 impl<BS, BK> ParBlocksSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type ParBlocksSize = U1;
@@ -165,7 +163,7 @@ where
 
 impl<BS, BK> BlockModeEncBackend for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     #[inline(always)]
diff --git a/cfb-mode/src/decrypt.rs b/cfb-mode/src/decrypt.rs
index c3ff33b..1d508f9 100644
--- a/cfb-mode/src/decrypt.rs
+++ b/cfb-mode/src/decrypt.rs
@@ -2,7 +2,8 @@ use cipher::{
     AlgorithmName, Array, Block, BlockCipherDecrypt, BlockCipherEncBackend, BlockCipherEncClosure,
     BlockCipherEncrypt, BlockModeDecBackend, BlockModeDecClosure, BlockModeDecrypt, BlockSizeUser,
     InnerIvInit, Iv, IvSizeUser, IvState, ParBlocks, ParBlocksSizeUser,
-    common::{BlockSizes, InnerUser},
+    array::ArraySize,
+    common::InnerUser,
     inout::{InOut, InOutBuf, NotEqualError},
     typenum::Unsigned,
 };
@@ -151,7 +152,7 @@ where
         /// create respective [`CbcDecryptBackend`] based on it.
         struct Closure<'a, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = BS>,
         {
             iv: &'a mut Array<u8, BS>,
@@ -160,7 +161,7 @@ where
 
         impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = BS>,
         {
             type BlockSize = BS;
@@ -168,7 +169,7 @@ where
 
         impl<BS, BC> BlockCipherEncClosure for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = BS>,
         {
             #[inline(always)]
@@ -289,7 +290,7 @@ impl<C: BlockCipherEncrypt + ZeroizeOnDrop> ZeroizeOnDrop for Decryptor<C> {}
 
 struct CbcDecryptBackend<'a, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     iv: &'a mut Array<u8, BS>,
@@ -298,7 +299,7 @@ where
 
 impl<BS, BK> BlockSizeUser for CbcDecryptBackend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type BlockSize = BS;
@@ -306,7 +307,7 @@ where
 
 impl<BS, BK> ParBlocksSizeUser for CbcDecryptBackend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type ParBlocksSize = BK::ParBlocksSize;
@@ -314,7 +315,7 @@ where
 
 impl<BS, BK> BlockModeDecBackend for CbcDecryptBackend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     #[inline(always)]
diff --git a/cfb-mode/src/encrypt.rs b/cfb-mode/src/encrypt.rs
index b991858..f16a655 100644
--- a/cfb-mode/src/encrypt.rs
+++ b/cfb-mode/src/encrypt.rs
@@ -2,8 +2,8 @@ use cipher::{
     AlgorithmName, Block, BlockCipherDecrypt, BlockCipherEncBackend, BlockCipherEncClosure,
     BlockCipherEncrypt, BlockModeEncBackend, BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser,
     InnerIvInit, Iv, IvSizeUser, IvState, ParBlocksSizeUser,
-    array::Array,
-    common::{BlockSizes, InnerUser},
+    array::{Array, ArraySize},
+    common::InnerUser,
     consts::U1,
     inout::{InOut, InOutBuf, NotEqualError},
 };
@@ -40,7 +40,7 @@ where
         /// respective `Backend` based on it.
         struct Closure<'a, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = BS>,
         {
             iv: &'a mut Array<u8, BS>,
@@ -49,7 +49,7 @@ where
 
         impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = BS>,
         {
             type BlockSize = BS;
@@ -57,7 +57,7 @@ where
 
         impl<BS, BC> BlockCipherEncClosure for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = BS>,
         {
             #[inline(always)]
@@ -178,7 +178,7 @@ impl<C: BlockCipherEncrypt + ZeroizeOnDrop> ZeroizeOnDrop for Encryptor<C> {}
 
 struct CbcEncryptBackend<'a, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     iv: &'a mut Array<u8, BS>,
@@ -187,7 +187,7 @@ where
 
 impl<BS, BK> BlockSizeUser for CbcEncryptBackend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type BlockSize = BS;
@@ -195,7 +195,7 @@ where
 
 impl<BS, BK> ParBlocksSizeUser for CbcEncryptBackend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type ParBlocksSize = U1;
@@ -203,7 +203,7 @@ where
 
 impl<BS, BK> BlockModeEncBackend for CbcEncryptBackend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     #[inline(always)]
diff --git a/cfb8/src/decrypt.rs b/cfb8/src/decrypt.rs
index a19f3ef..fe33b82 100644
--- a/cfb8/src/decrypt.rs
+++ b/cfb8/src/decrypt.rs
@@ -2,8 +2,8 @@ use cipher::{
     AlgorithmName, Block, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt,
     BlockModeDecBackend, BlockModeDecClosure, BlockModeDecrypt, BlockSizeUser, InnerIvInit, Iv,
     IvState, ParBlocksSizeUser,
-    array::Array,
-    common::{BlockSizes, InnerUser, IvSizeUser},
+    array::{Array, ArraySize},
+    common::{InnerUser, IvSizeUser},
     consts::U1,
     inout::{InOut, InOutBuf, NotEqualError},
 };
@@ -35,7 +35,7 @@ where
     fn decrypt_with_backend(&mut self, f: impl BlockModeDecClosure<BlockSize = Self::BlockSize>) {
         struct Closure<'a, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = U1>,
         {
             iv: &'a mut Array<u8, BS>,
@@ -44,7 +44,7 @@ where
 
         impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = U1>,
         {
             type BlockSize = BS;
@@ -52,7 +52,7 @@ where
 
         impl<BS, BC> BlockCipherEncClosure for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = U1>,
         {
             #[inline(always)]
@@ -162,7 +162,7 @@ impl<C: BlockCipherEncrypt + ZeroizeOnDrop> ZeroizeOnDrop for Decryptor<C> {}
 
 struct Backend<'a, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     iv: &'a mut Array<u8, BS>,
@@ -171,7 +171,7 @@ where
 
 impl<BS, BK> BlockSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type BlockSize = U1;
@@ -179,7 +179,7 @@ where
 
 impl<BS, BK> ParBlocksSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type ParBlocksSize = U1;
@@ -187,7 +187,7 @@ where
 
 impl<BS, BK> BlockModeDecBackend for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     #[inline(always)]
diff --git a/cfb8/src/encrypt.rs b/cfb8/src/encrypt.rs
index 09c6169..8a8fbc7 100644
--- a/cfb8/src/encrypt.rs
+++ b/cfb8/src/encrypt.rs
@@ -2,8 +2,8 @@ use cipher::{
     AlgorithmName, Block, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt,
     BlockModeEncBackend, BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser, InnerIvInit, Iv,
     IvState, ParBlocksSizeUser,
-    array::Array,
-    common::{BlockSizes, InnerUser, IvSizeUser},
+    array::{Array, ArraySize},
+    common::{InnerUser, IvSizeUser},
     consts::U1,
     inout::{InOut, InOutBuf, NotEqualError},
 };
@@ -35,7 +35,7 @@ where
     fn encrypt_with_backend(&mut self, f: impl BlockModeEncClosure<BlockSize = Self::BlockSize>) {
         struct Closure<'a, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = U1>,
         {
             iv: &'a mut Array<u8, BS>,
@@ -44,7 +44,7 @@ where
 
         impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = U1>,
         {
             type BlockSize = BS;
@@ -52,7 +52,7 @@ where
 
         impl<BS, BC> BlockCipherEncClosure for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = U1>,
         {
             #[inline(always)]
@@ -162,7 +162,7 @@ impl<C: BlockCipherEncrypt + ZeroizeOnDrop> ZeroizeOnDrop for Encryptor<C> {}
 
 struct Backend<'a, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     iv: &'a mut Array<u8, BS>,
@@ -171,7 +171,7 @@ where
 
 impl<BS, BK> BlockSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type BlockSize = U1;
@@ -179,7 +179,7 @@ where
 
 impl<BS, BK> ParBlocksSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type ParBlocksSize = U1;
@@ -187,7 +187,7 @@ where
 
 impl<BS, BK> BlockModeEncBackend for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     #[inline(always)]
diff --git a/ctr/src/ctr_core.rs b/ctr/src/ctr_core.rs
index cf191e2..b1aad70 100644
--- a/ctr/src/ctr_core.rs
+++ b/ctr/src/ctr_core.rs
@@ -4,7 +4,7 @@ use cipher::{
     BlockSizeUser, InnerIvInit, Iv, IvState, ParBlocks, ParBlocksSizeUser, StreamCipherBackend,
     StreamCipherClosure, StreamCipherCore, StreamCipherSeekCore,
     array::ArraySize,
-    common::{BlockSizes, InnerUser, IvSizeUser},
+    common::{InnerUser, IvSizeUser},
 };
 use core::fmt;
 
@@ -53,7 +53,7 @@ where
 
         impl<F, BS, SC> BlockSizeUser for Closure<'_, F, BS, SC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             F: CtrFlavor<BS>,
             SC: StreamCipherClosure<BlockSize = BS>,
         {
@@ -62,7 +62,7 @@ where
 
         impl<F, BS, SC> BlockCipherEncClosure for Closure<'_, F, BS, SC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             F: CtrFlavor<BS>,
             SC: StreamCipherClosure<BlockSize = BS>,
         {
diff --git a/cts/src/cbc_cs1.rs b/cts/src/cbc_cs1.rs
index 12cd81c..b282337 100644
--- a/cts/src/cbc_cs1.rs
+++ b/cts/src/cbc_cs1.rs
@@ -2,8 +2,8 @@ use crate::{Decrypt, Encrypt, Error, cbc_dec, cbc_enc, xor};
 use cipher::{
     Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt, BlockCipherEncBackend,
     BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, InnerIvInit, IvSizeUser,
-    array::Array,
-    common::{BlockSizes, InnerUser},
+    array::{Array, ArraySize},
+    common::InnerUser,
     inout::InOutBuf,
     typenum::Unsigned,
 };
@@ -53,16 +53,16 @@ impl<C: BlockCipherDecrypt> Decrypt for CbcCs1<C> {
     }
 }
 
-struct Closure<'a, BS: BlockSizes> {
+struct Closure<'a, BS: ArraySize> {
     iv: Array<u8, BS>,
     buf: InOutBuf<'a, 'a, u8>,
 }
 
-impl<BS: BlockSizes> BlockSizeUser for Closure<'_, BS> {
+impl<BS: ArraySize> BlockSizeUser for Closure<'_, BS> {
     type BlockSize = BS;
 }
 
-impl<BS: BlockSizes> BlockCipherEncClosure for Closure<'_, BS> {
+impl<BS: ArraySize> BlockCipherEncClosure for Closure<'_, BS> {
     fn call<B: BlockCipherEncBackend<BlockSize = BS>>(self, cipher: &B) {
         let Self { mut iv, mut buf } = self;
         let (blocks, tail) = buf.reborrow().into_chunks();
@@ -83,7 +83,7 @@ impl<BS: BlockSizes> BlockCipherEncClosure for Closure<'_, BS> {
     }
 }
 
-impl<BS: BlockSizes> BlockCipherDecClosure for Closure<'_, BS> {
+impl<BS: ArraySize> BlockCipherDecClosure for Closure<'_, BS> {
     fn call<B: BlockCipherDecBackend<BlockSize = BS>>(self, cipher: &B) {
         let Self { mut iv, mut buf } = self;
 
diff --git a/cts/src/cbc_cs2.rs b/cts/src/cbc_cs2.rs
index 458136e..d120c62 100644
--- a/cts/src/cbc_cs2.rs
+++ b/cts/src/cbc_cs2.rs
@@ -2,8 +2,8 @@ use crate::{Decrypt, Encrypt, Error, cbc_dec, cbc_enc, xor};
 use cipher::{
     Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt, BlockCipherEncBackend,
     BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, InnerIvInit, IvSizeUser,
-    array::Array,
-    common::{BlockSizes, InnerUser},
+    array::{Array, ArraySize},
+    common::InnerUser,
     inout::InOutBuf,
     typenum::Unsigned,
 };
@@ -53,16 +53,16 @@ impl<C: BlockCipherDecrypt> Decrypt for CbcCs2<C> {
     }
 }
 
-struct Closure<'a, BS: BlockSizes> {
+struct Closure<'a, BS: ArraySize> {
     iv: Array<u8, BS>,
     buf: InOutBuf<'a, 'a, u8>,
 }
 
-impl<BS: BlockSizes> BlockSizeUser for Closure<'_, BS> {
+impl<BS: ArraySize> BlockSizeUser for Closure<'_, BS> {
     type BlockSize = BS;
 }
 
-impl<BS: BlockSizes> BlockCipherEncClosure for Closure<'_, BS> {
+impl<BS: ArraySize> BlockCipherEncClosure for Closure<'_, BS> {
     fn call<B: BlockCipherEncBackend<BlockSize = BS>>(self, cipher: &B) {
         let Self { mut iv, mut buf } = self;
         let (mut blocks, mut tail) = buf.reborrow().into_chunks();
@@ -84,7 +84,7 @@ impl<BS: BlockSizes> BlockCipherEncClosure for Closure<'_, BS> {
     }
 }
 
-impl<BS: BlockSizes> BlockCipherDecClosure for Closure<'_, BS> {
+impl<BS: ArraySize> BlockCipherDecClosure for Closure<'_, BS> {
     fn call<B: BlockCipherDecBackend<BlockSize = BS>>(self, cipher: &B) {
         let Self { mut iv, mut buf } = self;
 
diff --git a/cts/src/cbc_cs3.rs b/cts/src/cbc_cs3.rs
index 07fe70d..52736e8 100644
--- a/cts/src/cbc_cs3.rs
+++ b/cts/src/cbc_cs3.rs
@@ -2,8 +2,8 @@ use crate::{Decrypt, Encrypt, Error, cbc_dec, cbc_enc, xor};
 use cipher::{
     Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt, BlockCipherEncBackend,
     BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, InnerIvInit, IvSizeUser,
-    array::Array,
-    common::{BlockSizes, InnerUser},
+    array::{Array, ArraySize},
+    common::InnerUser,
     inout::InOutBuf,
     typenum::Unsigned,
 };
@@ -53,16 +53,16 @@ impl<C: BlockCipherDecrypt> Decrypt for CbcCs3<C> {
     }
 }
 
-struct Closure<'a, BS: BlockSizes> {
+struct Closure<'a, BS: ArraySize> {
     iv: Array<u8, BS>,
     buf: InOutBuf<'a, 'a, u8>,
 }
 
-impl<BS: BlockSizes> BlockSizeUser for Closure<'_, BS> {
+impl<BS: ArraySize> BlockSizeUser for Closure<'_, BS> {
     type BlockSize = BS;
 }
 
-impl<BS: BlockSizes> BlockCipherEncClosure for Closure<'_, BS> {
+impl<BS: ArraySize> BlockCipherEncClosure for Closure<'_, BS> {
     fn call<B: BlockCipherEncBackend<BlockSize = BS>>(self, cipher: &B) {
         let Self { mut iv, mut buf } = self;
         let (mut blocks, mut tail) = buf.reborrow().into_chunks();
@@ -89,7 +89,7 @@ impl<BS: BlockSizes> BlockCipherEncClosure for Closure<'_, BS> {
     }
 }
 
-impl<BS: BlockSizes> BlockCipherDecClosure for Closure<'_, BS> {
+impl<BS: ArraySize> BlockCipherDecClosure for Closure<'_, BS> {
     fn call<B: BlockCipherDecBackend<BlockSize = BS>>(self, cipher: &B) {
         let Self { mut iv, buf } = self;
 
diff --git a/cts/src/ecb_cs1.rs b/cts/src/ecb_cs1.rs
index 7e5e8e6..d885d18 100644
--- a/cts/src/ecb_cs1.rs
+++ b/cts/src/ecb_cs1.rs
@@ -4,7 +4,8 @@ use crate::{Decrypt, Encrypt, Error, ecb_dec, ecb_enc};
 use cipher::{
     Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt, BlockCipherEncBackend,
     BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, IvSizeUser,
-    common::{BlockSizes, InnerInit, InnerUser},
+    array::ArraySize,
+    common::{InnerInit, InnerUser},
     inout::InOutBuf,
     typenum::Unsigned,
 };
@@ -54,16 +55,16 @@ impl<C: BlockCipherDecrypt> Decrypt for EcbCs1<C> {
     }
 }
 
-struct Closure<'a, BS: BlockSizes> {
+struct Closure<'a, BS: ArraySize> {
     buf: InOutBuf<'a, 'a, u8>,
     _pd: PhantomData<BS>,
 }
 
-impl<BS: BlockSizes> BlockSizeUser for Closure<'_, BS> {
+impl<BS: ArraySize> BlockSizeUser for Closure<'_, BS> {
     type BlockSize = BS;
 }
 
-impl<BS: BlockSizes> BlockCipherEncClosure for Closure<'_, BS> {
+impl<BS: ArraySize> BlockCipherEncClosure for Closure<'_, BS> {
     fn call<B: BlockCipherEncBackend<BlockSize = BS>>(self, cipher: &B) {
         let mut buf = self.buf;
         let (mut blocks, tail) = buf.reborrow().into_chunks();
@@ -88,7 +89,7 @@ impl<BS: BlockSizes> BlockCipherEncClosure for Closure<'_, BS> {
     }
 }
 
-impl<BS: BlockSizes> BlockCipherDecClosure for Closure<'_, BS> {
+impl<BS: ArraySize> BlockCipherDecClosure for Closure<'_, BS> {
     fn call<B: BlockCipherDecBackend<BlockSize = BS>>(self, cipher: &B) {
         let mut buf = self.buf;
         let (mut blocks, tail) = buf.reborrow().into_chunks();
diff --git a/cts/src/ecb_cs2.rs b/cts/src/ecb_cs2.rs
index 66ba586..e9067a1 100644
--- a/cts/src/ecb_cs2.rs
+++ b/cts/src/ecb_cs2.rs
@@ -4,7 +4,8 @@ use crate::{Decrypt, Encrypt, Error, ecb_dec, ecb_enc};
 use cipher::{
     Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt, BlockCipherEncBackend,
     BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, IvSizeUser,
-    common::{BlockSizes, InnerInit, InnerUser},
+    array::ArraySize,
+    common::{InnerInit, InnerUser},
     inout::InOutBuf,
     typenum::Unsigned,
 };
@@ -54,16 +55,16 @@ impl<C: BlockCipherDecrypt> Decrypt for EcbCs2<C> {
     }
 }
 
-struct Closure<'a, BS: BlockSizes> {
+struct Closure<'a, BS: ArraySize> {
     buf: InOutBuf<'a, 'a, u8>,
     _pd: PhantomData<BS>,
 }
 
-impl<BS: BlockSizes> BlockSizeUser for Closure<'_, BS> {
+impl<BS: ArraySize> BlockSizeUser for Closure<'_, BS> {
     type BlockSize = BS;
 }
 
-impl<BS: BlockSizes> BlockCipherEncClosure for Closure<'_, BS> {
+impl<BS: ArraySize> BlockCipherEncClosure for Closure<'_, BS> {
     fn call<B: BlockCipherEncBackend<BlockSize = BS>>(self, cipher: &B) {
         let mut buf = self.buf;
         let (mut blocks, mut tail) = buf.reborrow().into_chunks();
@@ -88,7 +89,7 @@ impl<BS: BlockSizes> BlockCipherEncClosure for Closure<'_, BS> {
     }
 }
 
-impl<BS: BlockSizes> BlockCipherDecClosure for Closure<'_, BS> {
+impl<BS: ArraySize> BlockCipherDecClosure for Closure<'_, BS> {
     fn call<B: BlockCipherDecBackend<BlockSize = BS>>(self, cipher: &B) {
         let mut buf = self.buf;
         let (mut blocks, mut tail) = buf.reborrow().into_chunks();
diff --git a/cts/src/ecb_cs3.rs b/cts/src/ecb_cs3.rs
index 061f56a..4fe35fa 100644
--- a/cts/src/ecb_cs3.rs
+++ b/cts/src/ecb_cs3.rs
@@ -4,7 +4,8 @@ use crate::{Decrypt, Encrypt, Error, ecb_dec, ecb_enc};
 use cipher::{
     Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt, BlockCipherEncBackend,
     BlockCipherEncClosure, BlockCipherEncrypt, BlockSizeUser, IvSizeUser,
-    common::{BlockSizes, InnerInit, InnerUser},
+    array::ArraySize,
+    common::{InnerInit, InnerUser},
     inout::InOutBuf,
     typenum::Unsigned,
 };
@@ -54,16 +55,16 @@ impl<C: BlockCipherDecrypt> Decrypt for EcbCs3<C> {
     }
 }
 
-struct Closure<'a, BS: BlockSizes> {
+struct Closure<'a, BS: ArraySize> {
     buf: InOutBuf<'a, 'a, u8>,
     _pd: PhantomData<BS>,
 }
 
-impl<BS: BlockSizes> BlockSizeUser for Closure<'_, BS> {
+impl<BS: ArraySize> BlockSizeUser for Closure<'_, BS> {
     type BlockSize = BS;
 }
 
-impl<BS: BlockSizes> BlockCipherEncClosure for Closure<'_, BS> {
+impl<BS: ArraySize> BlockCipherEncClosure for Closure<'_, BS> {
     fn call<B: BlockCipherEncBackend<BlockSize = BS>>(self, cipher: &B) {
         let mut buf = self.buf;
         let (mut blocks, mut tail) = buf.reborrow().into_chunks();
@@ -91,7 +92,7 @@ impl<BS: BlockSizes> BlockCipherEncClosure for Closure<'_, BS> {
     }
 }
 
-impl<BS: BlockSizes> BlockCipherDecClosure for Closure<'_, BS> {
+impl<BS: ArraySize> BlockCipherDecClosure for Closure<'_, BS> {
     fn call<B: BlockCipherDecBackend<BlockSize = BS>>(self, cipher: &B) {
         let mut buf = self.buf;
         let (mut blocks, mut tail) = buf.reborrow().into_chunks();
diff --git a/ige/src/decrypt.rs b/ige/src/decrypt.rs
index 4be4229..d30067a 100644
--- a/ige/src/decrypt.rs
+++ b/ige/src/decrypt.rs
@@ -4,7 +4,7 @@ use cipher::{
     BlockModeDecBackend, BlockModeDecClosure, BlockModeDecrypt, BlockSizeUser, InnerIvInit, Iv,
     IvState, ParBlocksSizeUser,
     array::{Array, ArraySize},
-    common::{BlockSizes, InnerUser, IvSizeUser},
+    common::{InnerUser, IvSizeUser},
     inout::InOut,
     typenum::{U1, Unsigned},
 };
@@ -34,7 +34,7 @@ where
     fn decrypt_with_backend(&mut self, f: impl BlockModeDecClosure<BlockSize = Self::BlockSize>) {
         struct Closure<'a, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = BS>,
         {
             x: &'a mut Array<u8, BS>,
@@ -44,7 +44,7 @@ where
 
         impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = BS>,
         {
             type BlockSize = BS;
@@ -52,7 +52,7 @@ where
 
         impl<BS, BC> BlockCipherDecClosure for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = BS>,
         {
             #[inline(always)]
@@ -180,7 +180,7 @@ where
 
 struct Backend<'a, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherDecBackend<BlockSize = BS>,
 {
     x: &'a mut Array<u8, BS>,
@@ -190,7 +190,7 @@ where
 
 impl<BS, BK> BlockSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherDecBackend<BlockSize = BS>,
 {
     type BlockSize = BS;
@@ -198,7 +198,7 @@ where
 
 impl<BS, BK> ParBlocksSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherDecBackend<BlockSize = BS>,
 {
     type ParBlocksSize = U1;
@@ -206,7 +206,7 @@ where
 
 impl<BS, BK> BlockModeDecBackend for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherDecBackend<BlockSize = BS>,
 {
     #[inline(always)]
diff --git a/ige/src/encrypt.rs b/ige/src/encrypt.rs
index 7cd1bf1..74d4326 100644
--- a/ige/src/encrypt.rs
+++ b/ige/src/encrypt.rs
@@ -4,7 +4,7 @@ use cipher::{
     BlockModeEncBackend, BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser, InnerIvInit, Iv,
     IvState, ParBlocksSizeUser,
     array::{Array, ArraySize},
-    common::{BlockSizes, InnerUser, IvSizeUser},
+    common::{InnerUser, IvSizeUser},
     inout::InOut,
     typenum::{U1, Unsigned},
 };
@@ -34,7 +34,7 @@ where
     fn encrypt_with_backend(&mut self, f: impl BlockModeEncClosure<BlockSize = Self::BlockSize>) {
         struct Closure<'a, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = BS>,
         {
             x: &'a mut Array<u8, BS>,
@@ -44,7 +44,7 @@ where
 
         impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = BS>,
         {
             type BlockSize = BS;
@@ -52,7 +52,7 @@ where
 
         impl<BS, BC> BlockCipherEncClosure for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = BS>,
         {
             #[inline(always)]
@@ -180,7 +180,7 @@ where
 
 struct Backend<'a, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     x: &'a mut Array<u8, BS>,
@@ -190,7 +190,7 @@ where
 
 impl<BS, BK> BlockSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type BlockSize = BS;
@@ -198,7 +198,7 @@ where
 
 impl<BS, BK> ParBlocksSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type ParBlocksSize = U1;
@@ -206,7 +206,7 @@ where
 
 impl<BS, BK> BlockModeEncBackend for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     #[inline(always)]
diff --git a/ofb/src/lib.rs b/ofb/src/lib.rs
index 16838c0..1901132 100644
--- a/ofb/src/lib.rs
+++ b/ofb/src/lib.rs
@@ -71,7 +71,8 @@ use cipher::{
     BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser, InOut, InnerIvInit, Iv, IvState,
     ParBlocksSizeUser, StreamCipherBackend, StreamCipherClosure, StreamCipherCore,
     StreamCipherCoreWrapper,
-    common::{BlockSizes, InnerUser, IvSizeUser},
+    array::ArraySize,
+    common::{InnerUser, IvSizeUser},
     consts::U1,
 };
 use core::fmt;
@@ -148,7 +149,7 @@ where
     fn process_with_backend(&mut self, f: impl StreamCipherClosure<BlockSize = Self::BlockSize>) {
         pub(crate) struct Closure<'a, BS, SC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             SC: StreamCipherClosure<BlockSize = BS>,
         {
             pub(crate) iv: &'a mut Array<u8, BS>,
@@ -157,7 +158,7 @@ where
 
         impl<BS, SC> BlockSizeUser for Closure<'_, BS, SC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             SC: StreamCipherClosure<BlockSize = BS>,
         {
             type BlockSize = BS;
@@ -165,7 +166,7 @@ where
 
         impl<BS, SC> BlockCipherEncClosure for Closure<'_, BS, SC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             SC: StreamCipherClosure<BlockSize = BS>,
         {
             #[inline(always)]
@@ -188,7 +189,7 @@ where
     fn encrypt_with_backend(&mut self, f: impl BlockModeEncClosure<BlockSize = Self::BlockSize>) {
         pub(crate) struct Closure<'a, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = BS>,
         {
             pub(crate) iv: &'a mut Array<u8, BS>,
@@ -197,7 +198,7 @@ where
 
         impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = BS>,
         {
             type BlockSize = BS;
@@ -205,7 +206,7 @@ where
 
         impl<BS, BC> BlockCipherEncClosure for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = BS>,
         {
             #[inline(always)]
@@ -228,7 +229,7 @@ where
     fn decrypt_with_backend(&mut self, f: impl BlockModeDecClosure<BlockSize = Self::BlockSize>) {
         pub(crate) struct Closure<'a, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = BS>,
         {
             pub(crate) iv: &'a mut Array<u8, BS>,
@@ -237,7 +238,7 @@ where
 
         impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = BS>,
         {
             type BlockSize = BS;
@@ -245,7 +246,7 @@ where
 
         impl<BS, BC> BlockCipherEncClosure for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = BS>,
         {
             #[inline(always)]
@@ -294,7 +295,7 @@ impl<C: BlockCipherEncrypt + ZeroizeOnDrop> ZeroizeOnDrop for OfbCore<C> {}
 
 pub(crate) struct Backend<'a, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     pub iv: &'a mut Array<u8, BS>,
@@ -303,7 +304,7 @@ where
 
 impl<BS, BK> BlockSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type BlockSize = BS;
@@ -311,7 +312,7 @@ where
 
 impl<BS, BK> ParBlocksSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type ParBlocksSize = U1;
@@ -319,7 +320,7 @@ where
 
 impl<BS, BK> StreamCipherBackend for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     #[inline(always)]
@@ -331,7 +332,7 @@ where
 
 impl<BS, BK> BlockModeEncBackend for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     #[inline(always)]
@@ -343,7 +344,7 @@ where
 
 impl<BS, BK> BlockModeDecBackend for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     #[inline(always)]
diff --git a/pcbc/src/decrypt.rs b/pcbc/src/decrypt.rs
index 285e43d..1078ac1 100644
--- a/pcbc/src/decrypt.rs
+++ b/pcbc/src/decrypt.rs
@@ -3,8 +3,8 @@ use cipher::{
     AlgorithmName, Block, BlockCipherDecBackend, BlockCipherDecClosure, BlockCipherDecrypt,
     BlockModeDecBackend, BlockModeDecClosure, BlockModeDecrypt, BlockSizeUser, InnerIvInit, Iv,
     IvState, ParBlocksSizeUser,
-    array::Array,
-    common::{BlockSizes, InnerUser, IvSizeUser},
+    array::{Array, ArraySize},
+    common::{InnerUser, IvSizeUser},
     consts::U1,
     inout::InOut,
 };
@@ -38,7 +38,7 @@ where
         /// respective `Backend` based on it.
         struct Closure<'a, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = BS>,
         {
             iv: &'a mut Array<u8, BS>,
@@ -47,7 +47,7 @@ where
 
         impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = BS>,
         {
             type BlockSize = BS;
@@ -55,7 +55,7 @@ where
 
         impl<BS, BC> BlockCipherDecClosure for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeDecClosure<BlockSize = BS>,
         {
             #[inline(always)]
@@ -144,7 +144,7 @@ impl<C: BlockCipherDecrypt + ZeroizeOnDrop> ZeroizeOnDrop for Decryptor<C> {}
 
 struct Backend<'a, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherDecBackend<BlockSize = BS>,
 {
     iv: &'a mut Array<u8, BS>,
@@ -153,7 +153,7 @@ where
 
 impl<BS, BK> BlockSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherDecBackend<BlockSize = BS>,
 {
     type BlockSize = BS;
@@ -161,7 +161,7 @@ where
 
 impl<BS, BK> ParBlocksSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherDecBackend<BlockSize = BS>,
 {
     type ParBlocksSize = U1;
@@ -169,7 +169,7 @@ where
 
 impl<BS, BK> BlockModeDecBackend for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherDecBackend<BlockSize = BS>,
 {
     #[inline(always)]
diff --git a/pcbc/src/encrypt.rs b/pcbc/src/encrypt.rs
index 4853849..ad1b384 100644
--- a/pcbc/src/encrypt.rs
+++ b/pcbc/src/encrypt.rs
@@ -3,8 +3,8 @@ use cipher::{
     AlgorithmName, Block, BlockCipherEncBackend, BlockCipherEncClosure, BlockCipherEncrypt,
     BlockModeEncBackend, BlockModeEncClosure, BlockModeEncrypt, BlockSizeUser, InnerIvInit, Iv,
     IvState, ParBlocksSizeUser,
-    array::Array,
-    common::{BlockSizes, InnerUser, IvSizeUser},
+    array::{Array, ArraySize},
+    common::{InnerUser, IvSizeUser},
     consts::U1,
     inout::InOut,
 };
@@ -38,7 +38,7 @@ where
         /// respective `Backend` based on it.
         struct Closure<'a, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = BS>,
         {
             iv: &'a mut Array<u8, BS>,
@@ -47,7 +47,7 @@ where
 
         impl<BS, BC> BlockSizeUser for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = BS>,
         {
             type BlockSize = BS;
@@ -55,7 +55,7 @@ where
 
         impl<BS, BC> BlockCipherEncClosure for Closure<'_, BS, BC>
         where
-            BS: BlockSizes,
+            BS: ArraySize,
             BC: BlockModeEncClosure<BlockSize = BS>,
         {
             #[inline(always)]
@@ -141,7 +141,7 @@ impl<C: BlockCipherEncrypt + ZeroizeOnDrop> ZeroizeOnDrop for Encryptor<C> {}
 
 struct Backend<'a, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     iv: &'a mut Array<u8, BS>,
@@ -150,7 +150,7 @@ where
 
 impl<BS, BK> BlockSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type BlockSize = BS;
@@ -158,7 +158,7 @@ where
 
 impl<BS, BK> ParBlocksSizeUser for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     type ParBlocksSize = U1;
@@ -166,7 +166,7 @@ where
 
 impl<BS, BK> BlockModeEncBackend for Backend<'_, BS, BK>
 where
-    BS: BlockSizes,
+    BS: ArraySize,
     BK: BlockCipherEncBackend<BlockSize = BS>,
 {
     #[inline(always)]