diff --git a/source/DensityElectrons.en.tex b/source/DensityElectrons.en.tex
index 193262d264fb8fddb1fd6c79eddede8ebda41e0a..cfc7860b1c63e8e485242b372d4b740693bc3881 100644
--- a/source/DensityElectrons.en.tex
+++ b/source/DensityElectrons.en.tex
@@ -1,6 +1,6 @@
 \begin{mhmodnl}{DensityElectrons}{en}
 \begin{definition}
-  Formula for the electron density for the Boltzmann approximation.
+  Formula for the \defii{electron}{density} for the Boltzmann approximation.
 \end{definition}
 \end{mhmodnl}
 
diff --git a/source/ElectrostaticPotential.en.tex b/source/ElectrostaticPotential.en.tex
index 94f7c7503f24c66e17ed386d64891dedb7ef47a4..ffec3aa06d908522b9ffc0598a99af636c40aaf3 100644
--- a/source/ElectrostaticPotential.en.tex
+++ b/source/ElectrostaticPotential.en.tex
@@ -1,6 +1,6 @@
 \begin{mhmodnl}{ElectrostaticPotential}{en}
   \begin{definition}
-    Spatial variation of the electrostatic potential, usually denoted by
+    Spatial variation of the \defii{electrostatic}{potential}, usually denoted by
     $\ElectrostaticPotential$.
   \end{definition}
 \end{mhmodnl}
diff --git a/source/ElectrostaticPotential.tex b/source/ElectrostaticPotential.tex
index ff831386f5363558712bc694c2e8352c82beb9f7..af9a981084553d8e864af7dc91b29e11c2258411 100644
--- a/source/ElectrostaticPotential.tex
+++ b/source/ElectrostaticPotential.tex
@@ -1,4 +1,4 @@
-I\begin{modsig}{ElectrostaticPotential}
+\begin{modsig}{ElectrostaticPotential}
   \gimport{DeviceGeometry}
 
   \symdef[name=electrostatic-potential]{ElectrostaticPotential}{\Psi}
diff --git a/source/FermiPotentialElectrons.en.tex b/source/FermiPotentialElectrons.en.tex
index 285919ed8f224690625a3948332b9919551ee213..e41beb9e806752d0d2ad4265b93b1fd8ea75f384 100644
--- a/source/FermiPotentialElectrons.en.tex
+++ b/source/FermiPotentialElectrons.en.tex
@@ -1,6 +1,6 @@
 \begin{mhmodnl}{FermiPotentialElectrons}{en}
 \begin{definition}
-  The \defiii{Fermi}{Potential}{Electrons} usually denoted by $\Fn$ is a function
+  The \defiii{Fermi}{Potential}{Electrons} usually denoted by $\QFPn$ is a function
   describing the variation of the quasi-Fermi potentials of the electrons across the
   domain $\DeviceDomain$.  It is linked to the quasi-Fermi level of the electrons which
   controls the occupation of the conduction band and is a measure for the electron density
diff --git a/source/FermiPotentialElectrons.tex b/source/FermiPotentialElectrons.tex
index 419265f3e962aef7b48ab795fa29290ad263689e..492fc7de7f5fca557c613c37fb6d79ac3cfcf256 100644
--- a/source/FermiPotentialElectrons.tex
+++ b/source/FermiPotentialElectrons.tex
@@ -2,9 +2,9 @@
 \begin{modsig}{FermiPotentialElectrons}
   \gimport{DeviceGeometry}
   
-  \symdef[name=quasi-Fermi-potential]{FnOp}{\varphi_n}
-  \symdef[name=quasi-Fermi-potential]{Fn}[1]{\prefix\FnOp{#1}}
-  \symtest{Fn}{\Fn{x}}
+  \symdef[name=quasi-Fermi-potential]{QFPnOp}{\varphi_n}
+  \symdef[name=quasi-Fermi-potential]{QFPn}[1]{\prefix{\QFPnOp}{#1}}
+  \symtest{QFPn}{\QFPn{x}}
 \end{modsig}
 
 %%% Local Variables:
diff --git a/source/FermiPotentialHoles.en.tex b/source/FermiPotentialHoles.en.tex
index 958a30c0a3c01c609c6b9f7f4e5c06577722b92e..2fdb227404635847083615fac17c5295b93bf4ae 100644
--- a/source/FermiPotentialHoles.en.tex
+++ b/source/FermiPotentialHoles.en.tex
@@ -1,6 +1,6 @@
 \begin{mhmodnl}{FermiPotentialHoles}{en}
 \begin{definition}
-  The \defiii{Fermi}{Potential}{Holes} usually denoted by $\Fp$ is a function describing
+  The \defiii{Fermi}{Potential}{Holes} usually denoted by $\QFPp$ is a function describing
   the variation of the quasi-Fermi potentials of the holes across the domain
   $\DeviceDomain$.  It is linked to the quasi-Fermi level of the holes which controls the
   occupation of the valance band. Its gradient is the driving force of the hole current.
diff --git a/source/FermiPotentialHoles.tex b/source/FermiPotentialHoles.tex
index 6ade30562ae39ec1b153aa0012d4d73c7d12f808..3600f4fa9469bad841244951bae51c463aec3b6b 100644
--- a/source/FermiPotentialHoles.tex
+++ b/source/FermiPotentialHoles.tex
@@ -1,9 +1,9 @@
 \begin{modsig}{FermiPotentialHoles}
   \gimport{DeviceGeometry}
   
-  \symdef[name=quasi-Fermi-potential]{FpOp}{\varphi_n}
-  \symdef[name=quasi-Fermi-potential]{Fp}[1]{\prefix\FpOp{#1}}
-  \symtest{Fp}{\Fp{x}}
+  \symdef[name=quasi-Fermi-potential]{QFPpOp}{\varphi_p}
+  \symdef[name=quasi-Fermi-potential]{QFPp}[1]{\prefix{\QFPpOp}{#1}}
+  \symtest{QFPp}{\QFPp{x}}
 \end{modsig}
 
 %%% Local Variables:
diff --git a/source/mmt/Quantities.mmt b/source/mmt/Quantities.mmt
index 9d0bb89775c788eb9bb529c15483fb5757fb950c..5691860a1c9c5496cc96af2ede0eb3a840534994 100644
--- a/source/mmt/Quantities.mmt
+++ b/source/mmt/Quantities.mmt
@@ -52,7 +52,8 @@ theory SpatialDensity : qe:?SIUnits =
 theory SpatialPotential : qe:?SIUnits =
 	include Models/device?DeviceGeometry ❙
   /T Spatial variation of the potential,
-	   usually denoted by $φ$. ❙
+
+usually denoted by $φ$. ❙
 	potential : Ω → (QE ElectricPotential) ❘ # φ ❘ role Quantity ❙	
 ❚
 	
@@ -66,4 +67,4 @@ theory SpatialCurrentDensity : qe:?SIUnits =
    include Models/device?DeviceGeometry ❙
    include ?CurrentDensity ❙
 	spatialcurrentdensity : Ω → QE currentdensity_dim ❘ # j ❘ role Quantity ❙
-❚
\ No newline at end of file
+❚