diff --git a/src/qutip_qip/device/cavityqed.py b/src/qutip_qip/device/cavityqed.py
index 220583f7..3a8e7682 100644
--- a/src/qutip_qip/device/cavityqed.py
+++ b/src/qutip_qip/device/cavityqed.py
@@ -132,12 +132,12 @@ def load_circuit(self, qc, schedule_mode="ASAP", compiler=None):
 
 class CavityQEDModel(Model):
     """
-    The physical model for a dispersive cavity-QED system.
+    The physical model for :obj:`.DispersiveCavityQED`.
 
     Parameters
     ----------
     num_qubits : int
-        The number of component systems.
+        The number of qubits.
     num_levels : int, optional
         The truncation level of the resonator.
     **params :
@@ -201,7 +201,7 @@ def _old_index_label_map(self):
 
     def _set_up_controls(self):
         """
-        Generate the Hamiltonians for the spinchain model and save them in the
+        Generate the Hamiltonians for the cavity-qed model and save them in the
         attribute `ctrls`.
 
         Parameters
diff --git a/src/qutip_qip/device/circuitqed.py b/src/qutip_qip/device/circuitqed.py
index 6e75f0ef..0af5b3fc 100644
--- a/src/qutip_qip/device/circuitqed.py
+++ b/src/qutip_qip/device/circuitqed.py
@@ -61,12 +61,12 @@ def topology_map(self, qc):
 
 class SCQubitsModel(Model):
     """
-    The physical model for superconducting qubits with fixed frequency.
+    The physical model for :obj:`.SCQubits`.
 
     Parameters
     ----------
     num_qubits: int
-        The number of component systems.
+        The number of qubits.
     dims: list, optional
         The dimension of each component system.
         Default value is a qubit system of ``dim=[2,2,2,...,2]``.
diff --git a/src/qutip_qip/device/modelprocessor.py b/src/qutip_qip/device/modelprocessor.py
index 7b7752e1..e7bf340b 100644
--- a/src/qutip_qip/device/modelprocessor.py
+++ b/src/qutip_qip/device/modelprocessor.py
@@ -28,7 +28,7 @@ class ModelProcessor(Processor):
     Parameters
     ----------
     num_qubits: int, optional
-        The number of component systems.
+        The number of qubits.
         It replaces the old API ``N``.
 
     dims: list, optional
diff --git a/src/qutip_qip/device/optpulseprocessor.py b/src/qutip_qip/device/optpulseprocessor.py
index 056c444f..e911aa11 100644
--- a/src/qutip_qip/device/optpulseprocessor.py
+++ b/src/qutip_qip/device/optpulseprocessor.py
@@ -27,7 +27,7 @@ class OptPulseProcessor(Processor):
     Parameters
     ----------
     num_qubits : int
-        The number of component systems.
+        The number of qubits.
 
     drift: `:class:`qutip.Qobj`
         The drift Hamiltonian. The size must match the whole quantum system.
diff --git a/src/qutip_qip/device/processor.py b/src/qutip_qip/device/processor.py
index 72953249..068b3229 100644
--- a/src/qutip_qip/device/processor.py
+++ b/src/qutip_qip/device/processor.py
@@ -33,7 +33,7 @@ class Processor(object):
     Parameters
     ----------
     num_qubits : int, optional
-        The number of component systems.
+        The number of qubits.
         It replaces the old API ``N``.
 
     dims : list, optional
@@ -1208,8 +1208,8 @@ class Model:
 
     Parameters
     ----------
-    num_qubits : int, optional
-        The number of component systems.
+    num_The number of qubits
+        The number of qubits.
     dims : list, optional
         The dimension of each component system.
         Default value is a qubit system of ``dim=[2,2,2,...,2]``.
@@ -1218,8 +1218,8 @@ class Model:
 
     Attributes
     ----------
-    num_qubits : int, optional
-        The number of component systems.
+    num_The number of qubits
+        The number of qubits.
     dims : list, optional
         The dimension of each component system.
     params : dict
diff --git a/src/qutip_qip/device/spinchain.py b/src/qutip_qip/device/spinchain.py
index bbfa8aa3..f10bda78 100644
--- a/src/qutip_qip/device/spinchain.py
+++ b/src/qutip_qip/device/spinchain.py
@@ -221,12 +221,12 @@ def topology_map(self, qc):
 
 class SpinChainModel(Model):
     """
-    Physical model for a spin chain qubits system.
+    Physical model for :obj:`CircularSpinChain` and :obj`LinearSpinChain`.
 
     Parameters
     ----------
     num_qubits: int
-        The number of component systems.
+        The number of qubits.
     setup : str
         "linear" for an open end and "circular" for a closed end chain.
     **params :
diff --git a/src/qutip_qip/noise.py b/src/qutip_qip/noise.py
index b9d190f1..58e08cfa 100644
--- a/src/qutip_qip/noise.py
+++ b/src/qutip_qip/noise.py
@@ -286,7 +286,7 @@ def _T_to_list(self, T, N):
         T: float or list
             The relaxation time
         N: int
-            The number of component systems.
+            The number of qubits.
 
         Returns
         -------
diff --git a/tests/test_model.py b/tests/test_model.py
index ca339dc7..f2aaede8 100644
--- a/tests/test_model.py
+++ b/tests/test_model.py
@@ -92,6 +92,7 @@ def test_define_model_in_processor():
     with pytest.raises(TypeError):
         processor.add_noise("non-noise-object")
 
+
 def test_change_parameters_in_processor():
     processor = LinearSpinChain(0, sx=0.1)
     assert(all(processor.params["sx"] == [0.1]))