diff --git a/common/src/dev.rs b/common/src/dev.rs
index b6a10805..11f17245 100644
--- a/common/src/dev.rs
+++ b/common/src/dev.rs
@@ -188,7 +188,7 @@ impl<F: Field> Mul<F> for Value<F> {
 ///     plonk::{Advice, Any, Circuit, Column, ConstraintSystem, Error, Selector},
 ///     poly::Rotation,
 /// };
-/// use ff::PrimeField;
+/// use halo2_middleware::ff::PrimeField;
 /// use halo2curves::pasta::Fp;
 /// const K: u32 = 5;
 ///
diff --git a/common/src/dev/cost_model.rs b/common/src/dev/cost_model.rs
index 51b3a1ad..86ce0380 100644
--- a/common/src/dev/cost_model.rs
+++ b/common/src/dev/cost_model.rs
@@ -5,7 +5,7 @@ use std::collections::HashSet;
 use std::{iter, num::ParseIntError, str::FromStr};
 
 use crate::plonk::Circuit;
-use ff::{Field, FromUniformBytes};
+use halo2_middleware::ff::{Field, FromUniformBytes};
 use serde::Deserialize;
 use serde_derive::Serialize;
 
diff --git a/common/src/dev/gates.rs b/common/src/dev/gates.rs
index 41ab2edd..dbe692fc 100644
--- a/common/src/dev/gates.rs
+++ b/common/src/dev/gates.rs
@@ -28,7 +28,7 @@ struct Gate {
 /// # Examples
 ///
 /// ```
-/// use ff::Field;
+/// use halo2_middleware::ff::Field;
 /// use halo2_proofs::{
 ///     circuit::{Layouter, SimpleFloorPlanner},
 ///     dev::CircuitGates,
diff --git a/common/src/dev/graph.rs b/common/src/dev/graph.rs
index 11654fe4..381cd6bd 100644
--- a/common/src/dev/graph.rs
+++ b/common/src/dev/graph.rs
@@ -1,4 +1,4 @@
-use ff::Field;
+use halo2_middleware::ff::Field;
 use tabbycat::{AttrList, Edge, GraphBuilder, GraphType, Identity, StmtList};
 
 use crate::{
diff --git a/common/src/dev/graph/layout.rs b/common/src/dev/graph/layout.rs
index 94bd7eea..4777e05f 100644
--- a/common/src/dev/graph/layout.rs
+++ b/common/src/dev/graph/layout.rs
@@ -1,4 +1,4 @@
-use ff::Field;
+use halo2_middleware::ff::Field;
 use plotters::{
     coord::Shift,
     prelude::{DrawingArea, DrawingAreaErrorKind, DrawingBackend},
diff --git a/common/src/dev/tfp.rs b/common/src/dev/tfp.rs
index ec1a195f..84bf1cc8 100644
--- a/common/src/dev/tfp.rs
+++ b/common/src/dev/tfp.rs
@@ -27,7 +27,7 @@ use halo2_middleware::circuit::{Advice, Any, Challenge, Column, Fixed, Instance}
 /// # Examples
 ///
 /// ```
-/// use ff::Field;
+/// use halo2_middleware::ff::Field;
 /// use halo2_proofs::{
 ///     circuit::{floor_planner, Layouter, Value},
 ///     dev::TracingFloorPlanner,
diff --git a/common/src/plonk/circuit.rs b/common/src/plonk/circuit.rs
index b226c704..b1bce130 100644
--- a/common/src/plonk/circuit.rs
+++ b/common/src/plonk/circuit.rs
@@ -118,7 +118,7 @@ impl SealedPhase for super::ThirdPhase {
 ///     circuit::{Chip, Layouter, Value},
 ///     plonk::{Advice, Column, Error, Selector},
 /// };
-/// use ff::Field;
+/// use halo2_middleware::ff::Field;
 /// # use halo2_proofs::plonk::Fixed;
 ///
 /// struct Config {
diff --git a/common/src/poly/ipa/commitment.rs b/common/src/poly/ipa/commitment.rs
index 00582626..b6e0945a 100644
--- a/common/src/poly/ipa/commitment.rs
+++ b/common/src/poly/ipa/commitment.rs
@@ -234,8 +234,8 @@ mod test {
     use crate::poly::ipa::commitment::{create_proof, verify_proof, ParamsIPA};
     use crate::poly::ipa::msm::MSMIPA;
 
-    use ff::Field;
     use group::Curve;
+    use halo2_middleware::ff::Field;
 
     #[test]
     fn test_commit_lagrange_epaffine() {
@@ -291,7 +291,7 @@ mod test {
     fn test_opening_proof() {
         const K: u32 = 6;
 
-        use ff::Field;
+        use halo2_middleware::ff::Field;
         use rand_core::OsRng;
 
         use super::super::commitment::{Blind, Params};
diff --git a/common/src/poly/kzg/commitment.rs b/common/src/poly/kzg/commitment.rs
index 07c6eb85..3a223173 100644
--- a/common/src/poly/kzg/commitment.rs
+++ b/common/src/poly/kzg/commitment.rs
@@ -365,7 +365,7 @@ mod test {
     use crate::poly::commitment::ParamsProver;
     use crate::poly::commitment::{Blind, Params};
     use crate::poly::kzg::commitment::ParamsKZG;
-    use ff::Field;
+    use halo2_middleware::ff::Field;
 
     #[test]
     fn test_commit_lagrange() {
diff --git a/common/src/poly/kzg/multiopen/shplonk.rs b/common/src/poly/kzg/multiopen/shplonk.rs
index 80cad76f..5f963f40 100644
--- a/common/src/poly/kzg/multiopen/shplonk.rs
+++ b/common/src/poly/kzg/multiopen/shplonk.rs
@@ -142,7 +142,7 @@ where
 #[cfg(test)]
 mod proptests {
     use super::{construct_intermediate_sets, Commitment, IntermediateSets};
-    use ff::FromUniformBytes;
+    use halo2_middleware::ff::FromUniformBytes;
     use halo2curves::pasta::Fp;
     use proptest::{collection::vec, prelude::*, sample::select};
     use std::convert::TryFrom;
diff --git a/common/src/poly/multiopen_test.rs b/common/src/poly/multiopen_test.rs
index 47c67311..7ee3e7c9 100644
--- a/common/src/poly/multiopen_test.rs
+++ b/common/src/poly/multiopen_test.rs
@@ -14,8 +14,8 @@ mod test {
         Blake2bRead, Blake2bWrite, Challenge255, EncodedChallenge, Keccak256Read, Keccak256Write,
         TranscriptReadBuffer, TranscriptWriterBuffer,
     };
-    use ff::WithSmallOrderMulGroup;
     use group::Curve;
+    use halo2_middleware::ff::WithSmallOrderMulGroup;
     use rand_core::OsRng;
 
     #[test]