diff --git a/Magnetodynamics/Lib_MagStaDyn_av_2D_Cir.pro b/Magnetodynamics/Lib_MagDyn_av_2D_Cir.pro
similarity index 94%
rename from Magnetodynamics/Lib_MagStaDyn_av_2D_Cir.pro
rename to Magnetodynamics/Lib_MagDyn_av_2D_Cir.pro
index aedde5bb86b3dd620a2b6ef1a74e000e80dc7a4b..2ef9af7b8b27ead498ba9fcebd0baefcdf3fac72 100644
--- a/Magnetodynamics/Lib_MagStaDyn_av_2D_Cir.pro
+++ b/Magnetodynamics/Lib_MagDyn_av_2D_Cir.pro
@@ -1,11 +1,11 @@
-// This is a template .pro file containing a general formulation for 2D
-// magnetostatic and magnetodynamic problems in terms of the magnetic vector
-// potential a (potentially coupled with the electric scalar potential v), with
-// optional circuit coupling.
+// Lib_MagDyn_av_2D_Cir.pro
+//
+// Template library for 2D magnetostatic and magnetodynamic problems in terms
+// of the magnetic vector potential a (potentially coupled with the electric
+// scalar potential v), with optional circuit coupling.
 
-// Below are definitions of the constants (inside "DefineConstant"), groups
-// (inside "DefineGroup") and functions (inside "DefineFunction") that can be
-// redefined from outside this template.
+// Default definitions of constants, groups and functions that can/should be
+// redefined from outside the template:
 
 DefineConstant[
   Flag_FrequencyDomain = 1, // frequency-domain or time-domain simulation
@@ -39,10 +39,9 @@ Group {
     Vol_Inf_Mag, // annulus where a infinite shell transformation is applied
 
     // Boundaries:
-    Sur_FluxTube_Mag, // boundary with Neumann BC
+    Sur_Neu_Mag, // boundary with Neumann BC (flux tube with n x h = nxh[])
     Sur_Perfect_Mag, // boundary of perfect conductors (non-meshed)
-    Sur_Imped_Mag // boundary of conductors approximated by a surface impedance
-                  // (non-meshed)
+    Sur_Imped_Mag // boundary of conductors approximated by an impedance (non-meshed)
   ];
   If(Flag_CircuitCoupling)
     DefineGroup[
@@ -63,7 +62,7 @@ Function {
     br, // remanent magnetic flux density (in Vol_M_Mag)
     js0, // source current density (in Vol_S0_Mag)
     dhdb, // Jacobian for Newton-Raphson method (in Vol_NL_Mag)
-    nxh, // n x magnetic field (on Sur_FluxTube_Mag)
+    nxh, // n x magnetic field (on Sur_Neu_Mag)
     Velocity, // velocity of moving part (in Vol_V_Mag)
     Ns, // number of turns (in Vol_S_Mag)
     Sc, // cross-section of windings (in Vol_S_Mag)
@@ -85,7 +84,7 @@ Group{
   // all linear materials
   Vol_L_Mag = Region[ {Vol_Mag, -Vol_NL_Mag} ];
   // all volumes + surfaces on which integrals will be computed
-  Dom_Mag = Region[ {Vol_Mag, Sur_FluxTube_Mag, Sur_Perfect_Mag, Sur_Imped_Mag} ];
+  Dom_Mag = Region[ {Vol_Mag, Sur_Neu_Mag, Sur_Perfect_Mag, Sur_Imped_Mag} ];
   If(Flag_CircuitCoupling)
     // all circuit impedances
     DomainZ_Cir = Region[ {Resistance_Cir, Inductance_Cir, Capacitance_Cir} ];
@@ -264,7 +263,7 @@ Formulation {
         In Vol_S_Mag; Jacobian Vol; Integration Gauss_v; }
 
       Integral { [ nxh[] , {a} ];
-        In Sur_FluxTube_Mag; Jacobian Sur; Integration Gauss_v; }
+        In Sur_Neu_Mag; Jacobian Sur; Integration Gauss_v; }
     }
   }
 }
@@ -323,7 +322,7 @@ Formulation {
         In Vol_S0_Mag; Jacobian Vol; Integration Gauss_v; }
 
       Integral { [ nxh[] , {a} ];
-        In Sur_FluxTube_Mag; Jacobian Sur; Integration Gauss_v; }
+        In Sur_Neu_Mag; Jacobian Sur; Integration Gauss_v; }
 
       Integral { DtDof [  Ysur[] * Dof{a} , {a} ];
         In Sur_Imped_Mag; Jacobian Sur; Integration Gauss_v; }
@@ -474,7 +473,8 @@ PostProcessing {
       { Name js; Value {
           Term { [ js0[] ]; In Vol_S0_Mag; Jacobian Vol; }
           Term { [  (js0[]*Vector[0,0,1])*{ir} ]; In Vol_S_Mag; Jacobian Vol; }
-          Term { [ Vector[0,0,0] ]; In Vol_Mag; Jacobian Vol; } // to force a vector result out of sources
+	  // to force a vector result out of sources
+          Term { [ Vector[0,0,0] ]; In Vol_Mag; Jacobian Vol; }
         }
       }
       { Name j; Value {
diff --git a/Magnetodynamics/electromagnet.pro b/Magnetodynamics/electromagnet.pro
index 4e9bf06873e69dabb39dfff351d6dd08050e6a50..902d0cdce08e21c5a8366871f0559589f22c1e9f 100644
--- a/Magnetodynamics/electromagnet.pro
+++ b/Magnetodynamics/electromagnet.pro
@@ -27,7 +27,7 @@ Group {
   Surface_bn0 = Region[ 1101 ];
   Surface_Inf = Region[ 1102 ];
 
-  // Abstract regions used in the "Lib_MagStaDyn_av_2D_Cir.pro" template file
+  // Abstract regions used in the "Lib_MagDyn_av_2D_Cir.pro" template file
   // that is included below:
   Vol_Mag = Region[{Air, Core, Ind, AirInf}]; // full magnetic domain
   Vol_C_Mag = Region[Core]; // massive conductors
@@ -77,7 +77,7 @@ Constraint {
   }
 }
 
-Include "Lib_MagStaDyn_av_2D_Cir.pro";
+Include "Lib_MagDyn_av_2D_Cir.pro";
 
 PostOperation {
   { Name Map_a; NameOfPostProcessing MagDyn_a_2D;
diff --git a/Magnetodynamics/transfo.pro b/Magnetodynamics/transfo.pro
index 8880426724e09f6df86a28b69e5cd59ce509c89e..6f4f02702eb602c0c1c90cd754573ebb577aea2a 100644
--- a/Magnetodynamics/transfo.pro
+++ b/Magnetodynamics/transfo.pro
@@ -40,7 +40,7 @@ Group {
   Coil_2 = Region[{Coil_2_P, Coil_2_M}];
   Coils = Region[{Coil_1, Coil_2}];
 
-  // Abstract regions that will be used in the "Lib_MagStaDyn_av_2D_Cir.pro"
+  // Abstract regions that will be used in the "Lib_MagDyn_av_2D_Cir.pro"
   // template file included below;
   Vol_Mag = Region[{Air, Core, Coils}]; // full magnetic domain
   If (type_Conds == 1)
@@ -198,7 +198,7 @@ Constraint {
   }
 }
 
-Include "Lib_MagStaDyn_av_2D_Cir.pro";
+Include "Lib_MagDyn_av_2D_Cir.pro";
 
 PostOperation {
   { Name Map_a; NameOfPostProcessing MagDyn_a_2D;