diff --git a/src/qibotn/QiboCircuitConvertor.py b/src/qibotn/circuit_convertor.py
similarity index 96%
rename from src/qibotn/QiboCircuitConvertor.py
rename to src/qibotn/circuit_convertor.py
index f67fb8e..14af79d 100644
--- a/src/qibotn/QiboCircuitConvertor.py
+++ b/src/qibotn/circuit_convertor.py
@@ -5,12 +5,12 @@ import numpy as np
 
 
 class QiboCircuitToEinsum:
-    """Convert a circuit to a Tensor Network (TN) representation. The circuit
-    is first processed to an intermediate form by grouping each gate matrix
-    with its corresponding qubit it is acting on to a list. It is then
-    converted to an equivalent TN expression through the class function
-    state_vector_operands() following the Einstein summation convention in the
-    interleave format.
+    """Convert a circuit to a Tensor Network (TN) representation.
+
+    The circuit is first processed to an intermediate form by grouping each gate matrix
+    with its corresponding qubit it is acting on to a list. It is then converted to an
+    equivalent TN expression through the class function state_vector_operands()
+    following the Einstein summation convention in the interleave format.
 
     See document for detail of the format: https://docs.nvidia.com/cuda/cuquantum/python/api/generated/cuquantum.contract.html
 
diff --git a/src/qibotn/QiboCircuitToMPS.py b/src/qibotn/circuit_to_mps.py
similarity index 89%
rename from src/qibotn/QiboCircuitToMPS.py
rename to src/qibotn/circuit_to_mps.py
index b1d847f..af8acd5 100644
--- a/src/qibotn/QiboCircuitToMPS.py
+++ b/src/qibotn/circuit_to_mps.py
@@ -2,8 +2,8 @@ import cupy as cp
 import numpy as np
 from cuquantum import cutensornet as cutn
 
-from qibotn.MPSUtils import apply_gate, initial
-from qibotn.QiboCircuitConvertor import QiboCircuitToEinsum
+from qibotn.circuit_convertor import QiboCircuitToEinsum
+from qibotn.mps_utils import apply_gate, initial
 
 
 class QiboCircuitToMPS:
diff --git a/src/qibotn/eval.py b/src/qibotn/eval.py
index 5fcb66f..6375aa6 100644
--- a/src/qibotn/eval.py
+++ b/src/qibotn/eval.py
@@ -2,9 +2,9 @@ import cupy as cp
 from cupy.cuda.runtime import getDeviceCount
 from cuquantum import contract
 
+from qibotn.circuit_convertor import QiboCircuitToEinsum
+from qibotn.circuit_to_mps import QiboCircuitToMPS
 from qibotn.mps_contraction_helper import MPSContractionHelper
-from qibotn.QiboCircuitConvertor import QiboCircuitToEinsum
-from qibotn.QiboCircuitToMPS import QiboCircuitToMPS
 
 
 def dense_vector_tn(qibo_circ, datatype):
diff --git a/src/qibotn/MPSUtils.py b/src/qibotn/mps_utils.py
similarity index 100%
rename from src/qibotn/MPSUtils.py
rename to src/qibotn/mps_utils.py