diff --git a/examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.yaml b/examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.yaml
index 7b05140cb..cd6c2eb24 100644
--- a/examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.yaml
+++ b/examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.yaml
@@ -1,9 +1,9 @@
 # Kuo, J. C., Mikrostrukturmechanik von Bikristallen mit Kippkorngrenzen. Shaker-Verlag 2004. http://edoc.mpg.de/204079
 Aluminum:
+  lattice: aP
   mechanics:
-    lattice: aP
-    elasticity: {C_11: 110.9e9, C_12: 58.34e9, type: hooke}
     output: [F, P, Fe, Fp, Lp]
+    elasticity: {type: hooke, C_11: 110.9e9, C_12: 58.34e9}
     plasticity:
       type: isotropic
       output: [xi]
diff --git a/examples/ConfigFiles/Phase_Isotropic_FreeSurface.yaml b/examples/ConfigFiles/Phase_Isotropic_FreeSurface.yaml
index 4d9690f44..db1636f28 100644
--- a/examples/ConfigFiles/Phase_Isotropic_FreeSurface.yaml
+++ b/examples/ConfigFiles/Phase_Isotropic_FreeSurface.yaml
@@ -1,9 +1,9 @@
 # Maiti and Eisenlohr 2018 Scripta Materialia
 Air:
+  lattice: aP
   mechanics:
-    lattice: aP
-    elasticity: {C_11: 10e9, C_12: 0.0, type: hooke}
     output: [F, P, Fe, Fp, Lp]
+    elasticity: {type: hooke, C_11: 10e9, C_12: 0.0}
     plasticity:
       type: isotropic
       output: [xi]
diff --git a/examples/ConfigFiles/Phase_Phenopowerlaw_Gold.yaml b/examples/ConfigFiles/Phase_Phenopowerlaw_Gold.yaml
index 6f55af739..475abfac3 100644
--- a/examples/ConfigFiles/Phase_Phenopowerlaw_Gold.yaml
+++ b/examples/ConfigFiles/Phase_Phenopowerlaw_Gold.yaml
@@ -1,16 +1,22 @@
+# parameters fitted by D. Ma to:
+# I. Kovács, G. Vörös
+# On the mathematical description of the tensile stress-strain curves of polycrystalline face centered cubic metals
+# International Journal of Plasticity, Volume 12, Issue 1, 1996, Pages 35–43
+# DOI: 10.1016/S0749-6419(95)00043-7
+
 Gold:
   lattice: cF
   mechanics:
     output: [F, P, F_e, F_p, L_p, O]
-    elasticity: {C_11: 191.0e9, C_12: 162.0e9, C_44: 42.20e9, type: hooke}
+    elasticity: {type: hooke, C_11: 191e9, C_12: 162e9, C_44: 42.2e9}
     plasticity:
+      type: phenopowerlaw
+      output: [xi_sl]
       N_sl: [12]
-      a_sl: 1.0
+      n_sl: 83
       dot_gamma_0_sl: 0.001
       h_0_sl_sl: 75e6
       h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4]
-      n_sl: 83.3
-      output: [xi_sl]
-      type: phenopowerlaw
-      xi_0_sl: [26.25e6]
-      xi_inf_sl: [53.00e6]
+      a_sl: 1.0
+      xi_0_sl: [26e6]
+      xi_inf_sl: [53e6]