From 8fd48ec2a01c8182a1663127cdb794c6cad0e845 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Mon, 12 Sep 2016 16:01:32 +0200
Subject: [PATCH] Update nuclide names to GND format. Fix a few other format
 changes.

---
 .../benchmark-1/openmc/geometry.xml           |   8 +-
 .../benchmark-1/openmc/materials.xml          |  56 +--
 .../benchmark-2/openmc/case1_1/materials.xml  | 338 +++++++++---------
 .../benchmark-2/openmc/case1_2/materials.xml  | 338 +++++++++---------
 .../benchmark-2/openmc/case1_3/materials.xml  | 338 +++++++++---------
 .../benchmark-2/openmc/case2_1/materials.xml  | 338 +++++++++---------
 .../benchmark-2/openmc/case2_2/materials.xml  | 338 +++++++++---------
 .../benchmark-2/openmc/case2_3/materials.xml  | 338 +++++++++---------
 8 files changed, 1046 insertions(+), 1046 deletions(-)

diff --git a/source-convergence/benchmark-1/openmc/geometry.xml b/source-convergence/benchmark-1/openmc/geometry.xml
index 0f7f157..23c7233 100644
--- a/source-convergence/benchmark-1/openmc/geometry.xml
+++ b/source-convergence/benchmark-1/openmc/geometry.xml
@@ -73,9 +73,9 @@
   <cell id="36" material="5" region="41 -42 52 -53 60 -63" /> <!-- top concrete -->
   <cell id="37" material="5" region="42 -43 50 -53 60 -63" /> <!-- right concrete -->
 
-  <lattice id="200" type="rectangular" dimension="15 15" lower_left="-10.5 -10.5" width="1.4 1.4">
+  <lattice id="200" dimension="15 15" lower_left="-10.5 -10.5" pitch="1.4 1.4">
     <universes>
-      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 
+      3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
       3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
       3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
       3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
@@ -93,7 +93,7 @@
     </universes>
   </lattice>
 
-  <lattice id="100" type="rectangular" dimension="24 3" lower_left="0. 0." width="27. 27.">
+  <lattice id="100" dimension="24 3" lower_left="0. 0." pitch="27. 27.">
     <universes>
       2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1
       1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2 1 2
@@ -101,4 +101,4 @@
     </universes>
   </lattice>
 
-</geometry>
\ No newline at end of file
+</geometry>
diff --git a/source-convergence/benchmark-1/openmc/materials.xml b/source-convergence/benchmark-1/openmc/materials.xml
index c189564..f4a3a3d 100644
--- a/source-convergence/benchmark-1/openmc/materials.xml
+++ b/source-convergence/benchmark-1/openmc/materials.xml
@@ -15,54 +15,54 @@
   <!-- UO2 fuel -->
   <material id="1">
     <density value="0.06925613" units="atom/b-cm" />
-    <nuclide name="U-235"  ao="2.2380e-02" />
-    <nuclide name="U-238"  ao="8.2213e-04" />
-    <nuclide name="O-16"   ao="4.6054e-02" />
+    <nuclide name="U235"  ao="2.2380e-02" />
+    <nuclide name="U238"  ao="8.2213e-04" />
+    <nuclide name="O16"   ao="4.6054e-02" />
   </material>
 
   <!-- Zirconium Clad -->
   <material id="2">
     <density value="4.2910e-02" units="atom/b-cm" />
-    <nuclide name="Zr-90" ao="2.2077e-02" />
-    <nuclide name="Zr-91" ao="4.8145e-03" />
-    <nuclide name="Zr-92" ao="7.3591e-03" />
-    <nuclide name="Zr-94" ao="7.4578e-03" />
-    <nuclide name="Zr-96" ao="1.2015e-03" />
+    <nuclide name="Zr90" ao="2.2077e-02" />
+    <nuclide name="Zr91" ao="4.8145e-03" />
+    <nuclide name="Zr92" ao="7.3591e-03" />
+    <nuclide name="Zr94" ao="7.4578e-03" />
+    <nuclide name="Zr96" ao="1.2015e-03" />
   </material>
 
   <!-- Water -->
   <material id="3">
     <density value="0.100059" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="6.6706e-02" />
-    <nuclide name="O-16" ao="3.3353e-02" />
-    <sab name="HH2O" xs="71t" />
+    <nuclide name="H1"  ao="6.6706e-02" />
+    <nuclide name="O16" ao="3.3353e-02" />
+    <sab name="c_H_in_H2O" />
   </material>
 
   <!-- Iron -->
   <material id="4">
     <density value="8.3770e-02" units="atom/b-cm" />
-    <nuclide name="Fe-54" ao="4.8964e-03" />
-    <nuclide name="Fe-56" ao="7.6862e-02" />
-    <nuclide name="Fe-57" ao="1.7751e-03" />
-    <nuclide name="Fe-58" ao="2.3623e-04" />
+    <nuclide name="Fe54" ao="4.8964e-03" />
+    <nuclide name="Fe56" ao="7.6862e-02" />
+    <nuclide name="Fe57" ao="1.7751e-03" />
+    <nuclide name="Fe58" ao="2.3623e-04" />
   </material>
 
   <!-- Concrete -->
   <material id="5">
     <density value="0.0725757" units="atom/b-cm" />
-    <nuclide name="H-1"   ao="5.5437e-03" />
-    <nuclide name="C-Nat" ao="6.9793e-03" />
-    <nuclide name="Si-28" ao="7.1115e-03" />
-    <nuclide name="Si-29" ao="3.6110e-04" />
-    <nuclide name="Si-30" ao="2.3804e-04" />
-    <nuclide name="Ca-40" ao="8.6850e-03" />
-    <nuclide name="Ca-42" ao="5.7965e-05" />
-    <nuclide name="Ca-43" ao="1.2095e-05" />
-    <nuclide name="Ca-44" ao="1.8689e-04" />
-    <nuclide name="Ca-46" ao="3.5836e-07" />
-    <nuclide name="Ca-48" ao="1.6754e-05" />
-    <nuclide name="O-16" ao="4.3383e-02" />
-    <sab name="HH2O" xs="71t" />
+    <nuclide name="H1"   ao="5.5437e-03" />
+    <nuclide name="C0" ao="6.9793e-03" />
+    <nuclide name="Si28" ao="7.1115e-03" />
+    <nuclide name="Si29" ao="3.6110e-04" />
+    <nuclide name="Si30" ao="2.3804e-04" />
+    <nuclide name="Ca40" ao="8.6850e-03" />
+    <nuclide name="Ca42" ao="5.7965e-05" />
+    <nuclide name="Ca43" ao="1.2095e-05" />
+    <nuclide name="Ca44" ao="1.8689e-04" />
+    <nuclide name="Ca46" ao="3.5836e-07" />
+    <nuclide name="Ca48" ao="1.6754e-05" />
+    <nuclide name="O16" ao="4.3383e-02" />
+    <sab name="c_H_in_H2O" />
   </material>
 
 </materials>
\ No newline at end of file
diff --git a/source-convergence/benchmark-2/openmc/case1_1/materials.xml b/source-convergence/benchmark-2/openmc/case1_1/materials.xml
index fcd752d..0d01152 100644
--- a/source-convergence/benchmark-2/openmc/case1_1/materials.xml
+++ b/source-convergence/benchmark-2/openmc/case1_1/materials.xml
@@ -17,27 +17,27 @@
   <!-- Water, 25 deg.C -->
   <material id="1">
     <density value="0.099987" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="6.6658e-02" />
-    <nuclide name="O-16" ao="3.3329e-02" />
-    <sab name="HH2O" xs="71t" />
+    <nuclide name="H1"  ao="6.6658e-02" />
+    <nuclide name="O16" ao="3.3329e-02" />
+    <sab name="c_H_in_H2O" />
   </material>
 
   <!-- Zircaloy-4 -->
   <material id="2">
     <density value="0.043206271" units="atom/b-cm" />
-    <nuclide name="Cr-50" ao="3.2975e-06" />
-    <nuclide name="Cr-52" ao="6.3588e-05" />
-    <nuclide name="Cr-53" ao="7.2104e-06" />
-    <nuclide name="Cr-54" ao="1.7948e-06" />
-    <nuclide name="Fe-54" ao="8.6728e-06" />
-    <nuclide name="Fe-56" ao="1.3614e-04" />
-    <nuclide name="Fe-57" ao="3.1442e-06" />
-    <nuclide name="Fe-58" ao="4.1843e-07" />
-    <nuclide name="Zr-90" ao="2.2114e-02" />
-    <nuclide name="Zr-91" ao="4.8226e-03" />
-    <nuclide name="Zr-92" ao="7.3714e-03" />
-    <nuclide name="Zr-94" ao="7.4703e-03" />
-    <nuclide name="Zr-96" ao="1.2035e-03" />
+    <nuclide name="Cr50" ao="3.2975e-06" />
+    <nuclide name="Cr52" ao="6.3588e-05" />
+    <nuclide name="Cr53" ao="7.2104e-06" />
+    <nuclide name="Cr54" ao="1.7948e-06" />
+    <nuclide name="Fe54" ao="8.6728e-06" />
+    <nuclide name="Fe56" ao="1.3614e-04" />
+    <nuclide name="Fe57" ao="3.1442e-06" />
+    <nuclide name="Fe58" ao="4.1843e-07" />
+    <nuclide name="Zr90" ao="2.2114e-02" />
+    <nuclide name="Zr91" ao="4.8226e-03" />
+    <nuclide name="Zr92" ao="7.3714e-03" />
+    <nuclide name="Zr94" ao="7.4703e-03" />
+    <nuclide name="Zr96" ao="1.2035e-03" />
   </material>
 
   <!-- ====================== Fresh fuels =========================== -->
@@ -45,29 +45,29 @@
   <!-- EU45: UO2, 4.5wt% enriched -->
   <material id="3">
     <density value="0.0693284852" units="atom/b-cm" />
-    <nuclide name="U-234" ao="8.4100e-06" />
-    <nuclide name="U-235" ao="1.0526e-03" />
-    <nuclide name="U-236" ao="6.4752e-06" />
-    <nuclide name="U-238" ao="2.2042e-02" />
-    <nuclide name="O-16"  ao="4.6219e-02" />
+    <nuclide name="U234" ao="8.4100e-06" />
+    <nuclide name="U235" ao="1.0526e-03" />
+    <nuclide name="U236" ao="6.4752e-06" />
+    <nuclide name="U238" ao="2.2042e-02" />
+    <nuclide name="O16"  ao="4.6219e-02" />
   </material>
 
   <!-- EU40: UO2, 4.0wt% enriched -->
   <material id="4">
     <density value="0.0696080381" units="atom/b-cm" />
-    <nuclide name="U-234" ao="7.5481e-06" />
-    <nuclide name="U-235" ao="9.3949e-04" />
-    <nuclide name="U-238" ao="2.2256e-02" />
-    <nuclide name="O-16"  ao="4.6405e-02" />
+    <nuclide name="U234" ao="7.5481e-06" />
+    <nuclide name="U235" ao="9.3949e-04" />
+    <nuclide name="U238" ao="2.2256e-02" />
+    <nuclide name="O16"  ao="4.6405e-02" />
   </material>
 
   <!-- NU: UO2, Natural uranium   -->
   <material id="5">
     <density value="0.0695822757" units="atom/b-cm" />
-    <nuclide name="U-234" ao="1.2757e-06" />
-    <nuclide name="U-235" ao="1.6700e-04" />
-    <nuclide name="U-238" ao="2.3026e-02" />
-    <nuclide name="O-16"  ao="4.6388e-02" />
+    <nuclide name="U234" ao="1.2757e-06" />
+    <nuclide name="U235" ao="1.6700e-04" />
+    <nuclide name="U238" ao="2.3026e-02" />
+    <nuclide name="O16"  ao="4.6388e-02" />
   </material>
 
   <!-- ===================== Burnup fuels =========================== -->
@@ -75,166 +75,166 @@
   <!-- B21G, EU45, 21.570 GWD/MTU -->
   <material id="6">
     <density value="0.0690055" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="6.4862e-06" />
-    <nuclide name="U-235"  ao="5.6758e-04" />
-    <nuclide name="U-236"  ao="9.4556e-05" />
-    <nuclide name="U-238"  ao="2.1732e-02" />
-    <nuclide name="Pu-238" ao="1.1322e-06" />
-    <nuclide name="Pu-239" ao="1.2591e-04" />
-    <nuclide name="Pu-240" ao="2.6395e-05" />
-    <nuclide name="Pu-241" ao="1.3614e-05" />
-    <nuclide name="Pu-242" ao="2.2623e-06" />
-    <nuclide name="Am-241" ao="4.0266e-06" />
-    <nuclide name="Am-243" ao="2.6222e-07" />
-    <nuclide name="Np-237" ao="6.8089e-06" />
-    <nuclide name="Mo-95"  ao="3.1530e-05" />
-    <nuclide name="Tc-99"  ao="3.0319e-05" />
-    <nuclide name="Ru-101" ao="2.7452e-05" />
-    <nuclide name="Rh-103" ao="1.7260e-05" />
-    <nuclide name="Ag-109" ao="1.8879e-06" />
-    <nuclide name="Cs-133" ao="3.3140e-05" />
-    <nuclide name="Sm-147" ao="6.4488e-06" />
-    <nuclide name="Sm-149" ao="1.9390e-07" />
-    <nuclide name="Sm-150" ao="7.1174e-06" />
-    <nuclide name="Sm-151" ao="5.7531e-07" />
-    <nuclide name="Sm-152" ao="3.0178e-06" />
-    <nuclide name="Nd-143" ao="2.5793e-05" />
-    <nuclide name="Nd-145" ao="1.8633e-05" />
-    <nuclide name="Eu-153" ao="2.0026e-06" />
-    <nuclide name="Gd-155" ao="1.1986e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="6.4862e-06" />
+    <nuclide name="U235"  ao="5.6758e-04" />
+    <nuclide name="U236"  ao="9.4556e-05" />
+    <nuclide name="U238"  ao="2.1732e-02" />
+    <nuclide name="Pu238" ao="1.1322e-06" />
+    <nuclide name="Pu239" ao="1.2591e-04" />
+    <nuclide name="Pu240" ao="2.6395e-05" />
+    <nuclide name="Pu241" ao="1.3614e-05" />
+    <nuclide name="Pu242" ao="2.2623e-06" />
+    <nuclide name="Am241" ao="4.0266e-06" />
+    <nuclide name="Am243" ao="2.6222e-07" />
+    <nuclide name="Np237" ao="6.8089e-06" />
+    <nuclide name="Mo95"  ao="3.1530e-05" />
+    <nuclide name="Tc99"  ao="3.0319e-05" />
+    <nuclide name="Ru101" ao="2.7452e-05" />
+    <nuclide name="Rh103" ao="1.7260e-05" />
+    <nuclide name="Ag109" ao="1.8879e-06" />
+    <nuclide name="Cs133" ao="3.3140e-05" />
+    <nuclide name="Sm147" ao="6.4488e-06" />
+    <nuclide name="Sm149" ao="1.9390e-07" />
+    <nuclide name="Sm150" ao="7.1174e-06" />
+    <nuclide name="Sm151" ao="5.7531e-07" />
+    <nuclide name="Sm152" ao="3.0178e-06" />
+    <nuclide name="Nd143" ao="2.5793e-05" />
+    <nuclide name="Nd145" ao="1.8633e-05" />
+    <nuclide name="Eu153" ao="2.0026e-06" />
+    <nuclide name="Gd155" ao="1.1986e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B24G, EU45, 24.023 GWD/MTU -->
   <material id="7">
     <density value="0.0689673" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="6.2881e-06" />
-    <nuclide name="U-235"  ao="5.2562e-04" />
-    <nuclide name="U-236"  ao="1.0155e-04" />
-    <nuclide name="U-238"  ao="2.1693e-02" />
-    <nuclide name="Pu-238" ao="1.4876e-06" />
-    <nuclide name="Pu-239" ao="1.3161e-04" />
-    <nuclide name="Pu-240" ao="2.9965e-05" />
-    <nuclide name="Pu-241" ao="1.5953e-05" />
-    <nuclide name="Pu-242" ao="3.0335e-06" />
-    <nuclide name="Am-241" ao="4.7603e-06" />
-    <nuclide name="Am-243" ao="3.9809e-07" />
-    <nuclide name="Np-237" ao="7.9041e-06" />
-    <nuclide name="Mo-95"  ao="3.4781e-05" />
-    <nuclide name="Tc-99"  ao="3.3465e-05" />
-    <nuclide name="Ru-101" ao="3.0548e-05" />
-    <nuclide name="Rh-103" ao="1.9008e-05" />
-    <nuclide name="Ag-109" ao="2.2230e-06" />
-    <nuclide name="Cs-133" ao="3.6549e-05" />
-    <nuclide name="Sm-147" ao="6.9339e-06" />
-    <nuclide name="Sm-149" ao="1.9611e-07" />
-    <nuclide name="Sm-150" ao="8.0472e-06" />
-    <nuclide name="Sm-151" ao="6.0064e-07" />
-    <nuclide name="Sm-152" ao="3.3473e-06" />
-    <nuclide name="Nd-143" ao="2.8067e-05" />
-    <nuclide name="Nd-145" ao="2.0504e-05" />
-    <nuclide name="Eu-153" ao="2.3329e-06" />
-    <nuclide name="Gd-155" ao="1.4386e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="6.2881e-06" />
+    <nuclide name="U235"  ao="5.2562e-04" />
+    <nuclide name="U236"  ao="1.0155e-04" />
+    <nuclide name="U238"  ao="2.1693e-02" />
+    <nuclide name="Pu238" ao="1.4876e-06" />
+    <nuclide name="Pu239" ao="1.3161e-04" />
+    <nuclide name="Pu240" ao="2.9965e-05" />
+    <nuclide name="Pu241" ao="1.5953e-05" />
+    <nuclide name="Pu242" ao="3.0335e-06" />
+    <nuclide name="Am241" ao="4.7603e-06" />
+    <nuclide name="Am243" ao="3.9809e-07" />
+    <nuclide name="Np237" ao="7.9041e-06" />
+    <nuclide name="Mo95"  ao="3.4781e-05" />
+    <nuclide name="Tc99"  ao="3.3465e-05" />
+    <nuclide name="Ru101" ao="3.0548e-05" />
+    <nuclide name="Rh103" ao="1.9008e-05" />
+    <nuclide name="Ag109" ao="2.2230e-06" />
+    <nuclide name="Cs133" ao="3.6549e-05" />
+    <nuclide name="Sm147" ao="6.9339e-06" />
+    <nuclide name="Sm149" ao="1.9611e-07" />
+    <nuclide name="Sm150" ao="8.0472e-06" />
+    <nuclide name="Sm151" ao="6.0064e-07" />
+    <nuclide name="Sm152" ao="3.3473e-06" />
+    <nuclide name="Nd143" ao="2.8067e-05" />
+    <nuclide name="Nd145" ao="2.0504e-05" />
+    <nuclide name="Eu153" ao="2.3329e-06" />
+    <nuclide name="Gd155" ao="1.4386e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B30G, EU45, 30.580 GWD/MTU -->
   <material id="8">
     <density value="0.0688634" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="5.7868e-06" />
-    <nuclide name="U-235"  ao="4.2455e-04" />
-    <nuclide name="U-236"  ao="1.1763e-04" />
-    <nuclide name="U-238"  ao="2.1585e-02" />
-    <nuclide name="Pu-238" ao="2.7262e-06" />
-    <nuclide name="Pu-239" ao="1.4249e-04" />
-    <nuclide name="Pu-240" ao="3.9140e-05" />
-    <nuclide name="Pu-241" ao="2.1863e-05" />
-    <nuclide name="Pu-242" ao="5.6472e-06" />
-    <nuclide name="Am-241" ao="6.6579e-06" />
-    <nuclide name="Am-243" ao="9.7353e-07" />
-    <nuclide name="Np-237" ao="1.0948e-05" />
-    <nuclide name="Mo-95"  ao="4.3130e-05" />
-    <nuclide name="Tc-99"  ao="4.1531e-05" />
-    <nuclide name="Ru-101" ao="3.8751e-05" />
-    <nuclide name="Rh-103" ao="2.3371e-05" />
-    <nuclide name="Ag-109" ao="3.1774e-06" />
-    <nuclide name="Cs-133" ao="4.5257e-05" />
-    <nuclide name="Sm-147" ao="8.0315e-06" />
-    <nuclide name="Sm-149" ao="1.9935e-07" />
-    <nuclide name="Sm-150" ao="1.0496e-05" />
-    <nuclide name="Sm-151" ao="6.6160e-07" />
-    <nuclide name="Sm-152" ao="4.1844e-06" />
-    <nuclide name="Nd-143" ao="3.3502e-05" />
-    <nuclide name="Nd-145" ao="2.5263e-05" />
-    <nuclide name="Eu-153" ao="3.2546e-06" />
-    <nuclide name="Gd-155" ao="2.2155e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="5.7868e-06" />
+    <nuclide name="U235"  ao="4.2455e-04" />
+    <nuclide name="U236"  ao="1.1763e-04" />
+    <nuclide name="U238"  ao="2.1585e-02" />
+    <nuclide name="Pu238" ao="2.7262e-06" />
+    <nuclide name="Pu239" ao="1.4249e-04" />
+    <nuclide name="Pu240" ao="3.9140e-05" />
+    <nuclide name="Pu241" ao="2.1863e-05" />
+    <nuclide name="Pu242" ao="5.6472e-06" />
+    <nuclide name="Am241" ao="6.6579e-06" />
+    <nuclide name="Am243" ao="9.7353e-07" />
+    <nuclide name="Np237" ao="1.0948e-05" />
+    <nuclide name="Mo95"  ao="4.3130e-05" />
+    <nuclide name="Tc99"  ao="4.1531e-05" />
+    <nuclide name="Ru101" ao="3.8751e-05" />
+    <nuclide name="Rh103" ao="2.3371e-05" />
+    <nuclide name="Ag109" ao="3.1774e-06" />
+    <nuclide name="Cs133" ao="4.5257e-05" />
+    <nuclide name="Sm147" ao="8.0315e-06" />
+    <nuclide name="Sm149" ao="1.9935e-07" />
+    <nuclide name="Sm150" ao="1.0496e-05" />
+    <nuclide name="Sm151" ao="6.6160e-07" />
+    <nuclide name="Sm152" ao="4.1844e-06" />
+    <nuclide name="Nd143" ao="3.3502e-05" />
+    <nuclide name="Nd145" ao="2.5263e-05" />
+    <nuclide name="Eu153" ao="3.2546e-06" />
+    <nuclide name="Gd155" ao="2.2155e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B40G, EU45, 40.424 GWD/MTU -->
   <material id="9">
     <density value="0.0687030" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="5.1152e-06" />
-    <nuclide name="U-235"  ao="3.0002e-04" />
-    <nuclide name="U-236"  ao="1.3534e-04" />
-    <nuclide name="U-238"  ao="2.1413e-02" />
-    <nuclide name="Pu-238" ao="5.3656e-06" />
-    <nuclide name="Pu-239" ao="1.5064e-04" />
-    <nuclide name="Pu-240" ao="5.1484e-05" />
-    <nuclide name="Pu-241" ao="2.9175e-05" />
-    <nuclide name="Pu-242" ao="1.0893e-05" />
-    <nuclide name="Am-241" ao="9.0866e-06" />
-    <nuclide name="Am-243" ao="2.5108e-06" />
-    <nuclide name="Np-237" ao="1.5602e-05" />
-    <nuclide name="Mo-95"  ao="5.4806e-05" />
-    <nuclide name="Tc-99"  ao="5.2746e-05" />
-    <nuclide name="Ru-101" ao="5.0881e-05" />
-    <nuclide name="Rh-103" ao="2.9057e-05" />
-    <nuclide name="Ag-109" ao="4.7134e-06" />
-    <nuclide name="Cs-133" ao="5.7263e-05" />
-    <nuclide name="Sm-147" ao="9.2075e-06" />
-    <nuclide name="Sm-149" ao="1.9993e-07" />
-    <nuclide name="Sm-150" ao="1.3997e-05" />
-    <nuclide name="Sm-151" ao="7.3765e-07" />
-    <nuclide name="Sm-152" ao="5.3316e-06" />
-    <nuclide name="Nd-143" ao="3.9984e-05" />
-    <nuclide name="Nd-145" ao="3.1783e-05" />
-    <nuclide name="Eu-153" ao="4.6705e-06" />
-    <nuclide name="Gd-155" ao="3.6871e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="5.1152e-06" />
+    <nuclide name="U235"  ao="3.0002e-04" />
+    <nuclide name="U236"  ao="1.3534e-04" />
+    <nuclide name="U238"  ao="2.1413e-02" />
+    <nuclide name="Pu238" ao="5.3656e-06" />
+    <nuclide name="Pu239" ao="1.5064e-04" />
+    <nuclide name="Pu240" ao="5.1484e-05" />
+    <nuclide name="Pu241" ao="2.9175e-05" />
+    <nuclide name="Pu242" ao="1.0893e-05" />
+    <nuclide name="Am241" ao="9.0866e-06" />
+    <nuclide name="Am243" ao="2.5108e-06" />
+    <nuclide name="Np237" ao="1.5602e-05" />
+    <nuclide name="Mo95"  ao="5.4806e-05" />
+    <nuclide name="Tc99"  ao="5.2746e-05" />
+    <nuclide name="Ru101" ao="5.0881e-05" />
+    <nuclide name="Rh103" ao="2.9057e-05" />
+    <nuclide name="Ag109" ao="4.7134e-06" />
+    <nuclide name="Cs133" ao="5.7263e-05" />
+    <nuclide name="Sm147" ao="9.2075e-06" />
+    <nuclide name="Sm149" ao="1.9993e-07" />
+    <nuclide name="Sm150" ao="1.3997e-05" />
+    <nuclide name="Sm151" ao="7.3765e-07" />
+    <nuclide name="Sm152" ao="5.3316e-06" />
+    <nuclide name="Nd143" ao="3.9984e-05" />
+    <nuclide name="Nd145" ao="3.1783e-05" />
+    <nuclide name="Eu153" ao="4.6705e-06" />
+    <nuclide name="Gd155" ao="3.6871e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B40G, EU55, 54.605 GWD/MTU -->
   <material id="10">
     <density value="0.06845907" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="4.3280e-06" />
-    <nuclide name="U-235"  ao="1.7108e-04" />
-    <nuclide name="U-236"  ao="1.4897e-04" />
-    <nuclide name="U-238"  ao="2.1142e-02" />
-    <nuclide name="Pu-238" ao="1.0471e-05" />
-    <nuclide name="Pu-239" ao="1.5300e-04" />
-    <nuclide name="Pu-240" ao="6.5540e-05" />
-    <nuclide name="Pu-241" ao="3.6032e-05" />
-    <nuclide name="Pu-242" ao="2.0303e-05" />
-    <nuclide name="Am-241" ao="1.1405e-05" />
-    <nuclide name="Am-243" ao="6.1550e-06" />
-    <nuclide name="Np-237" ao="2.1806e-05" />
-    <nuclide name="Mo-95"  ao="6.9892e-05" />
-    <nuclide name="Tc-99"  ao="6.6975e-05" />
-    <nuclide name="Ru-101" ao="6.7875e-05" />
-    <nuclide name="Rh-103" ao="3.5406e-05" />
-    <nuclide name="Ag-109" ao="6.9836e-06" />
-    <nuclide name="Cs-133" ao="7.2263e-05" />
-    <nuclide name="Sm-147" ao="1.0106e-05" />
-    <nuclide name="Sm-149" ao="1.9259e-07" />
-    <nuclide name="Sm-150" ao="1.8627e-05" />
-    <nuclide name="Sm-151" ao="8.1779e-07" />
-    <nuclide name="Sm-152" ao="6.7637e-06" />
-    <nuclide name="Nd-143" ao="4.5992e-05" />
-    <nuclide name="Nd-145" ao="3.9892e-05" />
-    <nuclide name="Eu-153" ao="6.5858e-06" />
-    <nuclide name="Gd-155" ao="6.0862e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="4.3280e-06" />
+    <nuclide name="U235"  ao="1.7108e-04" />
+    <nuclide name="U236"  ao="1.4897e-04" />
+    <nuclide name="U238"  ao="2.1142e-02" />
+    <nuclide name="Pu238" ao="1.0471e-05" />
+    <nuclide name="Pu239" ao="1.5300e-04" />
+    <nuclide name="Pu240" ao="6.5540e-05" />
+    <nuclide name="Pu241" ao="3.6032e-05" />
+    <nuclide name="Pu242" ao="2.0303e-05" />
+    <nuclide name="Am241" ao="1.1405e-05" />
+    <nuclide name="Am243" ao="6.1550e-06" />
+    <nuclide name="Np237" ao="2.1806e-05" />
+    <nuclide name="Mo95"  ao="6.9892e-05" />
+    <nuclide name="Tc99"  ao="6.6975e-05" />
+    <nuclide name="Ru101" ao="6.7875e-05" />
+    <nuclide name="Rh103" ao="3.5406e-05" />
+    <nuclide name="Ag109" ao="6.9836e-06" />
+    <nuclide name="Cs133" ao="7.2263e-05" />
+    <nuclide name="Sm147" ao="1.0106e-05" />
+    <nuclide name="Sm149" ao="1.9259e-07" />
+    <nuclide name="Sm150" ao="1.8627e-05" />
+    <nuclide name="Sm151" ao="8.1779e-07" />
+    <nuclide name="Sm152" ao="6.7637e-06" />
+    <nuclide name="Nd143" ao="4.5992e-05" />
+    <nuclide name="Nd145" ao="3.9892e-05" />
+    <nuclide name="Eu153" ao="6.5858e-06" />
+    <nuclide name="Gd155" ao="6.0862e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
 </materials>
diff --git a/source-convergence/benchmark-2/openmc/case1_2/materials.xml b/source-convergence/benchmark-2/openmc/case1_2/materials.xml
index fcd752d..0d01152 100644
--- a/source-convergence/benchmark-2/openmc/case1_2/materials.xml
+++ b/source-convergence/benchmark-2/openmc/case1_2/materials.xml
@@ -17,27 +17,27 @@
   <!-- Water, 25 deg.C -->
   <material id="1">
     <density value="0.099987" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="6.6658e-02" />
-    <nuclide name="O-16" ao="3.3329e-02" />
-    <sab name="HH2O" xs="71t" />
+    <nuclide name="H1"  ao="6.6658e-02" />
+    <nuclide name="O16" ao="3.3329e-02" />
+    <sab name="c_H_in_H2O" />
   </material>
 
   <!-- Zircaloy-4 -->
   <material id="2">
     <density value="0.043206271" units="atom/b-cm" />
-    <nuclide name="Cr-50" ao="3.2975e-06" />
-    <nuclide name="Cr-52" ao="6.3588e-05" />
-    <nuclide name="Cr-53" ao="7.2104e-06" />
-    <nuclide name="Cr-54" ao="1.7948e-06" />
-    <nuclide name="Fe-54" ao="8.6728e-06" />
-    <nuclide name="Fe-56" ao="1.3614e-04" />
-    <nuclide name="Fe-57" ao="3.1442e-06" />
-    <nuclide name="Fe-58" ao="4.1843e-07" />
-    <nuclide name="Zr-90" ao="2.2114e-02" />
-    <nuclide name="Zr-91" ao="4.8226e-03" />
-    <nuclide name="Zr-92" ao="7.3714e-03" />
-    <nuclide name="Zr-94" ao="7.4703e-03" />
-    <nuclide name="Zr-96" ao="1.2035e-03" />
+    <nuclide name="Cr50" ao="3.2975e-06" />
+    <nuclide name="Cr52" ao="6.3588e-05" />
+    <nuclide name="Cr53" ao="7.2104e-06" />
+    <nuclide name="Cr54" ao="1.7948e-06" />
+    <nuclide name="Fe54" ao="8.6728e-06" />
+    <nuclide name="Fe56" ao="1.3614e-04" />
+    <nuclide name="Fe57" ao="3.1442e-06" />
+    <nuclide name="Fe58" ao="4.1843e-07" />
+    <nuclide name="Zr90" ao="2.2114e-02" />
+    <nuclide name="Zr91" ao="4.8226e-03" />
+    <nuclide name="Zr92" ao="7.3714e-03" />
+    <nuclide name="Zr94" ao="7.4703e-03" />
+    <nuclide name="Zr96" ao="1.2035e-03" />
   </material>
 
   <!-- ====================== Fresh fuels =========================== -->
@@ -45,29 +45,29 @@
   <!-- EU45: UO2, 4.5wt% enriched -->
   <material id="3">
     <density value="0.0693284852" units="atom/b-cm" />
-    <nuclide name="U-234" ao="8.4100e-06" />
-    <nuclide name="U-235" ao="1.0526e-03" />
-    <nuclide name="U-236" ao="6.4752e-06" />
-    <nuclide name="U-238" ao="2.2042e-02" />
-    <nuclide name="O-16"  ao="4.6219e-02" />
+    <nuclide name="U234" ao="8.4100e-06" />
+    <nuclide name="U235" ao="1.0526e-03" />
+    <nuclide name="U236" ao="6.4752e-06" />
+    <nuclide name="U238" ao="2.2042e-02" />
+    <nuclide name="O16"  ao="4.6219e-02" />
   </material>
 
   <!-- EU40: UO2, 4.0wt% enriched -->
   <material id="4">
     <density value="0.0696080381" units="atom/b-cm" />
-    <nuclide name="U-234" ao="7.5481e-06" />
-    <nuclide name="U-235" ao="9.3949e-04" />
-    <nuclide name="U-238" ao="2.2256e-02" />
-    <nuclide name="O-16"  ao="4.6405e-02" />
+    <nuclide name="U234" ao="7.5481e-06" />
+    <nuclide name="U235" ao="9.3949e-04" />
+    <nuclide name="U238" ao="2.2256e-02" />
+    <nuclide name="O16"  ao="4.6405e-02" />
   </material>
 
   <!-- NU: UO2, Natural uranium   -->
   <material id="5">
     <density value="0.0695822757" units="atom/b-cm" />
-    <nuclide name="U-234" ao="1.2757e-06" />
-    <nuclide name="U-235" ao="1.6700e-04" />
-    <nuclide name="U-238" ao="2.3026e-02" />
-    <nuclide name="O-16"  ao="4.6388e-02" />
+    <nuclide name="U234" ao="1.2757e-06" />
+    <nuclide name="U235" ao="1.6700e-04" />
+    <nuclide name="U238" ao="2.3026e-02" />
+    <nuclide name="O16"  ao="4.6388e-02" />
   </material>
 
   <!-- ===================== Burnup fuels =========================== -->
@@ -75,166 +75,166 @@
   <!-- B21G, EU45, 21.570 GWD/MTU -->
   <material id="6">
     <density value="0.0690055" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="6.4862e-06" />
-    <nuclide name="U-235"  ao="5.6758e-04" />
-    <nuclide name="U-236"  ao="9.4556e-05" />
-    <nuclide name="U-238"  ao="2.1732e-02" />
-    <nuclide name="Pu-238" ao="1.1322e-06" />
-    <nuclide name="Pu-239" ao="1.2591e-04" />
-    <nuclide name="Pu-240" ao="2.6395e-05" />
-    <nuclide name="Pu-241" ao="1.3614e-05" />
-    <nuclide name="Pu-242" ao="2.2623e-06" />
-    <nuclide name="Am-241" ao="4.0266e-06" />
-    <nuclide name="Am-243" ao="2.6222e-07" />
-    <nuclide name="Np-237" ao="6.8089e-06" />
-    <nuclide name="Mo-95"  ao="3.1530e-05" />
-    <nuclide name="Tc-99"  ao="3.0319e-05" />
-    <nuclide name="Ru-101" ao="2.7452e-05" />
-    <nuclide name="Rh-103" ao="1.7260e-05" />
-    <nuclide name="Ag-109" ao="1.8879e-06" />
-    <nuclide name="Cs-133" ao="3.3140e-05" />
-    <nuclide name="Sm-147" ao="6.4488e-06" />
-    <nuclide name="Sm-149" ao="1.9390e-07" />
-    <nuclide name="Sm-150" ao="7.1174e-06" />
-    <nuclide name="Sm-151" ao="5.7531e-07" />
-    <nuclide name="Sm-152" ao="3.0178e-06" />
-    <nuclide name="Nd-143" ao="2.5793e-05" />
-    <nuclide name="Nd-145" ao="1.8633e-05" />
-    <nuclide name="Eu-153" ao="2.0026e-06" />
-    <nuclide name="Gd-155" ao="1.1986e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="6.4862e-06" />
+    <nuclide name="U235"  ao="5.6758e-04" />
+    <nuclide name="U236"  ao="9.4556e-05" />
+    <nuclide name="U238"  ao="2.1732e-02" />
+    <nuclide name="Pu238" ao="1.1322e-06" />
+    <nuclide name="Pu239" ao="1.2591e-04" />
+    <nuclide name="Pu240" ao="2.6395e-05" />
+    <nuclide name="Pu241" ao="1.3614e-05" />
+    <nuclide name="Pu242" ao="2.2623e-06" />
+    <nuclide name="Am241" ao="4.0266e-06" />
+    <nuclide name="Am243" ao="2.6222e-07" />
+    <nuclide name="Np237" ao="6.8089e-06" />
+    <nuclide name="Mo95"  ao="3.1530e-05" />
+    <nuclide name="Tc99"  ao="3.0319e-05" />
+    <nuclide name="Ru101" ao="2.7452e-05" />
+    <nuclide name="Rh103" ao="1.7260e-05" />
+    <nuclide name="Ag109" ao="1.8879e-06" />
+    <nuclide name="Cs133" ao="3.3140e-05" />
+    <nuclide name="Sm147" ao="6.4488e-06" />
+    <nuclide name="Sm149" ao="1.9390e-07" />
+    <nuclide name="Sm150" ao="7.1174e-06" />
+    <nuclide name="Sm151" ao="5.7531e-07" />
+    <nuclide name="Sm152" ao="3.0178e-06" />
+    <nuclide name="Nd143" ao="2.5793e-05" />
+    <nuclide name="Nd145" ao="1.8633e-05" />
+    <nuclide name="Eu153" ao="2.0026e-06" />
+    <nuclide name="Gd155" ao="1.1986e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B24G, EU45, 24.023 GWD/MTU -->
   <material id="7">
     <density value="0.0689673" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="6.2881e-06" />
-    <nuclide name="U-235"  ao="5.2562e-04" />
-    <nuclide name="U-236"  ao="1.0155e-04" />
-    <nuclide name="U-238"  ao="2.1693e-02" />
-    <nuclide name="Pu-238" ao="1.4876e-06" />
-    <nuclide name="Pu-239" ao="1.3161e-04" />
-    <nuclide name="Pu-240" ao="2.9965e-05" />
-    <nuclide name="Pu-241" ao="1.5953e-05" />
-    <nuclide name="Pu-242" ao="3.0335e-06" />
-    <nuclide name="Am-241" ao="4.7603e-06" />
-    <nuclide name="Am-243" ao="3.9809e-07" />
-    <nuclide name="Np-237" ao="7.9041e-06" />
-    <nuclide name="Mo-95"  ao="3.4781e-05" />
-    <nuclide name="Tc-99"  ao="3.3465e-05" />
-    <nuclide name="Ru-101" ao="3.0548e-05" />
-    <nuclide name="Rh-103" ao="1.9008e-05" />
-    <nuclide name="Ag-109" ao="2.2230e-06" />
-    <nuclide name="Cs-133" ao="3.6549e-05" />
-    <nuclide name="Sm-147" ao="6.9339e-06" />
-    <nuclide name="Sm-149" ao="1.9611e-07" />
-    <nuclide name="Sm-150" ao="8.0472e-06" />
-    <nuclide name="Sm-151" ao="6.0064e-07" />
-    <nuclide name="Sm-152" ao="3.3473e-06" />
-    <nuclide name="Nd-143" ao="2.8067e-05" />
-    <nuclide name="Nd-145" ao="2.0504e-05" />
-    <nuclide name="Eu-153" ao="2.3329e-06" />
-    <nuclide name="Gd-155" ao="1.4386e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="6.2881e-06" />
+    <nuclide name="U235"  ao="5.2562e-04" />
+    <nuclide name="U236"  ao="1.0155e-04" />
+    <nuclide name="U238"  ao="2.1693e-02" />
+    <nuclide name="Pu238" ao="1.4876e-06" />
+    <nuclide name="Pu239" ao="1.3161e-04" />
+    <nuclide name="Pu240" ao="2.9965e-05" />
+    <nuclide name="Pu241" ao="1.5953e-05" />
+    <nuclide name="Pu242" ao="3.0335e-06" />
+    <nuclide name="Am241" ao="4.7603e-06" />
+    <nuclide name="Am243" ao="3.9809e-07" />
+    <nuclide name="Np237" ao="7.9041e-06" />
+    <nuclide name="Mo95"  ao="3.4781e-05" />
+    <nuclide name="Tc99"  ao="3.3465e-05" />
+    <nuclide name="Ru101" ao="3.0548e-05" />
+    <nuclide name="Rh103" ao="1.9008e-05" />
+    <nuclide name="Ag109" ao="2.2230e-06" />
+    <nuclide name="Cs133" ao="3.6549e-05" />
+    <nuclide name="Sm147" ao="6.9339e-06" />
+    <nuclide name="Sm149" ao="1.9611e-07" />
+    <nuclide name="Sm150" ao="8.0472e-06" />
+    <nuclide name="Sm151" ao="6.0064e-07" />
+    <nuclide name="Sm152" ao="3.3473e-06" />
+    <nuclide name="Nd143" ao="2.8067e-05" />
+    <nuclide name="Nd145" ao="2.0504e-05" />
+    <nuclide name="Eu153" ao="2.3329e-06" />
+    <nuclide name="Gd155" ao="1.4386e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B30G, EU45, 30.580 GWD/MTU -->
   <material id="8">
     <density value="0.0688634" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="5.7868e-06" />
-    <nuclide name="U-235"  ao="4.2455e-04" />
-    <nuclide name="U-236"  ao="1.1763e-04" />
-    <nuclide name="U-238"  ao="2.1585e-02" />
-    <nuclide name="Pu-238" ao="2.7262e-06" />
-    <nuclide name="Pu-239" ao="1.4249e-04" />
-    <nuclide name="Pu-240" ao="3.9140e-05" />
-    <nuclide name="Pu-241" ao="2.1863e-05" />
-    <nuclide name="Pu-242" ao="5.6472e-06" />
-    <nuclide name="Am-241" ao="6.6579e-06" />
-    <nuclide name="Am-243" ao="9.7353e-07" />
-    <nuclide name="Np-237" ao="1.0948e-05" />
-    <nuclide name="Mo-95"  ao="4.3130e-05" />
-    <nuclide name="Tc-99"  ao="4.1531e-05" />
-    <nuclide name="Ru-101" ao="3.8751e-05" />
-    <nuclide name="Rh-103" ao="2.3371e-05" />
-    <nuclide name="Ag-109" ao="3.1774e-06" />
-    <nuclide name="Cs-133" ao="4.5257e-05" />
-    <nuclide name="Sm-147" ao="8.0315e-06" />
-    <nuclide name="Sm-149" ao="1.9935e-07" />
-    <nuclide name="Sm-150" ao="1.0496e-05" />
-    <nuclide name="Sm-151" ao="6.6160e-07" />
-    <nuclide name="Sm-152" ao="4.1844e-06" />
-    <nuclide name="Nd-143" ao="3.3502e-05" />
-    <nuclide name="Nd-145" ao="2.5263e-05" />
-    <nuclide name="Eu-153" ao="3.2546e-06" />
-    <nuclide name="Gd-155" ao="2.2155e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="5.7868e-06" />
+    <nuclide name="U235"  ao="4.2455e-04" />
+    <nuclide name="U236"  ao="1.1763e-04" />
+    <nuclide name="U238"  ao="2.1585e-02" />
+    <nuclide name="Pu238" ao="2.7262e-06" />
+    <nuclide name="Pu239" ao="1.4249e-04" />
+    <nuclide name="Pu240" ao="3.9140e-05" />
+    <nuclide name="Pu241" ao="2.1863e-05" />
+    <nuclide name="Pu242" ao="5.6472e-06" />
+    <nuclide name="Am241" ao="6.6579e-06" />
+    <nuclide name="Am243" ao="9.7353e-07" />
+    <nuclide name="Np237" ao="1.0948e-05" />
+    <nuclide name="Mo95"  ao="4.3130e-05" />
+    <nuclide name="Tc99"  ao="4.1531e-05" />
+    <nuclide name="Ru101" ao="3.8751e-05" />
+    <nuclide name="Rh103" ao="2.3371e-05" />
+    <nuclide name="Ag109" ao="3.1774e-06" />
+    <nuclide name="Cs133" ao="4.5257e-05" />
+    <nuclide name="Sm147" ao="8.0315e-06" />
+    <nuclide name="Sm149" ao="1.9935e-07" />
+    <nuclide name="Sm150" ao="1.0496e-05" />
+    <nuclide name="Sm151" ao="6.6160e-07" />
+    <nuclide name="Sm152" ao="4.1844e-06" />
+    <nuclide name="Nd143" ao="3.3502e-05" />
+    <nuclide name="Nd145" ao="2.5263e-05" />
+    <nuclide name="Eu153" ao="3.2546e-06" />
+    <nuclide name="Gd155" ao="2.2155e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B40G, EU45, 40.424 GWD/MTU -->
   <material id="9">
     <density value="0.0687030" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="5.1152e-06" />
-    <nuclide name="U-235"  ao="3.0002e-04" />
-    <nuclide name="U-236"  ao="1.3534e-04" />
-    <nuclide name="U-238"  ao="2.1413e-02" />
-    <nuclide name="Pu-238" ao="5.3656e-06" />
-    <nuclide name="Pu-239" ao="1.5064e-04" />
-    <nuclide name="Pu-240" ao="5.1484e-05" />
-    <nuclide name="Pu-241" ao="2.9175e-05" />
-    <nuclide name="Pu-242" ao="1.0893e-05" />
-    <nuclide name="Am-241" ao="9.0866e-06" />
-    <nuclide name="Am-243" ao="2.5108e-06" />
-    <nuclide name="Np-237" ao="1.5602e-05" />
-    <nuclide name="Mo-95"  ao="5.4806e-05" />
-    <nuclide name="Tc-99"  ao="5.2746e-05" />
-    <nuclide name="Ru-101" ao="5.0881e-05" />
-    <nuclide name="Rh-103" ao="2.9057e-05" />
-    <nuclide name="Ag-109" ao="4.7134e-06" />
-    <nuclide name="Cs-133" ao="5.7263e-05" />
-    <nuclide name="Sm-147" ao="9.2075e-06" />
-    <nuclide name="Sm-149" ao="1.9993e-07" />
-    <nuclide name="Sm-150" ao="1.3997e-05" />
-    <nuclide name="Sm-151" ao="7.3765e-07" />
-    <nuclide name="Sm-152" ao="5.3316e-06" />
-    <nuclide name="Nd-143" ao="3.9984e-05" />
-    <nuclide name="Nd-145" ao="3.1783e-05" />
-    <nuclide name="Eu-153" ao="4.6705e-06" />
-    <nuclide name="Gd-155" ao="3.6871e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="5.1152e-06" />
+    <nuclide name="U235"  ao="3.0002e-04" />
+    <nuclide name="U236"  ao="1.3534e-04" />
+    <nuclide name="U238"  ao="2.1413e-02" />
+    <nuclide name="Pu238" ao="5.3656e-06" />
+    <nuclide name="Pu239" ao="1.5064e-04" />
+    <nuclide name="Pu240" ao="5.1484e-05" />
+    <nuclide name="Pu241" ao="2.9175e-05" />
+    <nuclide name="Pu242" ao="1.0893e-05" />
+    <nuclide name="Am241" ao="9.0866e-06" />
+    <nuclide name="Am243" ao="2.5108e-06" />
+    <nuclide name="Np237" ao="1.5602e-05" />
+    <nuclide name="Mo95"  ao="5.4806e-05" />
+    <nuclide name="Tc99"  ao="5.2746e-05" />
+    <nuclide name="Ru101" ao="5.0881e-05" />
+    <nuclide name="Rh103" ao="2.9057e-05" />
+    <nuclide name="Ag109" ao="4.7134e-06" />
+    <nuclide name="Cs133" ao="5.7263e-05" />
+    <nuclide name="Sm147" ao="9.2075e-06" />
+    <nuclide name="Sm149" ao="1.9993e-07" />
+    <nuclide name="Sm150" ao="1.3997e-05" />
+    <nuclide name="Sm151" ao="7.3765e-07" />
+    <nuclide name="Sm152" ao="5.3316e-06" />
+    <nuclide name="Nd143" ao="3.9984e-05" />
+    <nuclide name="Nd145" ao="3.1783e-05" />
+    <nuclide name="Eu153" ao="4.6705e-06" />
+    <nuclide name="Gd155" ao="3.6871e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B40G, EU55, 54.605 GWD/MTU -->
   <material id="10">
     <density value="0.06845907" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="4.3280e-06" />
-    <nuclide name="U-235"  ao="1.7108e-04" />
-    <nuclide name="U-236"  ao="1.4897e-04" />
-    <nuclide name="U-238"  ao="2.1142e-02" />
-    <nuclide name="Pu-238" ao="1.0471e-05" />
-    <nuclide name="Pu-239" ao="1.5300e-04" />
-    <nuclide name="Pu-240" ao="6.5540e-05" />
-    <nuclide name="Pu-241" ao="3.6032e-05" />
-    <nuclide name="Pu-242" ao="2.0303e-05" />
-    <nuclide name="Am-241" ao="1.1405e-05" />
-    <nuclide name="Am-243" ao="6.1550e-06" />
-    <nuclide name="Np-237" ao="2.1806e-05" />
-    <nuclide name="Mo-95"  ao="6.9892e-05" />
-    <nuclide name="Tc-99"  ao="6.6975e-05" />
-    <nuclide name="Ru-101" ao="6.7875e-05" />
-    <nuclide name="Rh-103" ao="3.5406e-05" />
-    <nuclide name="Ag-109" ao="6.9836e-06" />
-    <nuclide name="Cs-133" ao="7.2263e-05" />
-    <nuclide name="Sm-147" ao="1.0106e-05" />
-    <nuclide name="Sm-149" ao="1.9259e-07" />
-    <nuclide name="Sm-150" ao="1.8627e-05" />
-    <nuclide name="Sm-151" ao="8.1779e-07" />
-    <nuclide name="Sm-152" ao="6.7637e-06" />
-    <nuclide name="Nd-143" ao="4.5992e-05" />
-    <nuclide name="Nd-145" ao="3.9892e-05" />
-    <nuclide name="Eu-153" ao="6.5858e-06" />
-    <nuclide name="Gd-155" ao="6.0862e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="4.3280e-06" />
+    <nuclide name="U235"  ao="1.7108e-04" />
+    <nuclide name="U236"  ao="1.4897e-04" />
+    <nuclide name="U238"  ao="2.1142e-02" />
+    <nuclide name="Pu238" ao="1.0471e-05" />
+    <nuclide name="Pu239" ao="1.5300e-04" />
+    <nuclide name="Pu240" ao="6.5540e-05" />
+    <nuclide name="Pu241" ao="3.6032e-05" />
+    <nuclide name="Pu242" ao="2.0303e-05" />
+    <nuclide name="Am241" ao="1.1405e-05" />
+    <nuclide name="Am243" ao="6.1550e-06" />
+    <nuclide name="Np237" ao="2.1806e-05" />
+    <nuclide name="Mo95"  ao="6.9892e-05" />
+    <nuclide name="Tc99"  ao="6.6975e-05" />
+    <nuclide name="Ru101" ao="6.7875e-05" />
+    <nuclide name="Rh103" ao="3.5406e-05" />
+    <nuclide name="Ag109" ao="6.9836e-06" />
+    <nuclide name="Cs133" ao="7.2263e-05" />
+    <nuclide name="Sm147" ao="1.0106e-05" />
+    <nuclide name="Sm149" ao="1.9259e-07" />
+    <nuclide name="Sm150" ao="1.8627e-05" />
+    <nuclide name="Sm151" ao="8.1779e-07" />
+    <nuclide name="Sm152" ao="6.7637e-06" />
+    <nuclide name="Nd143" ao="4.5992e-05" />
+    <nuclide name="Nd145" ao="3.9892e-05" />
+    <nuclide name="Eu153" ao="6.5858e-06" />
+    <nuclide name="Gd155" ao="6.0862e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
 </materials>
diff --git a/source-convergence/benchmark-2/openmc/case1_3/materials.xml b/source-convergence/benchmark-2/openmc/case1_3/materials.xml
index fcd752d..0d01152 100644
--- a/source-convergence/benchmark-2/openmc/case1_3/materials.xml
+++ b/source-convergence/benchmark-2/openmc/case1_3/materials.xml
@@ -17,27 +17,27 @@
   <!-- Water, 25 deg.C -->
   <material id="1">
     <density value="0.099987" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="6.6658e-02" />
-    <nuclide name="O-16" ao="3.3329e-02" />
-    <sab name="HH2O" xs="71t" />
+    <nuclide name="H1"  ao="6.6658e-02" />
+    <nuclide name="O16" ao="3.3329e-02" />
+    <sab name="c_H_in_H2O" />
   </material>
 
   <!-- Zircaloy-4 -->
   <material id="2">
     <density value="0.043206271" units="atom/b-cm" />
-    <nuclide name="Cr-50" ao="3.2975e-06" />
-    <nuclide name="Cr-52" ao="6.3588e-05" />
-    <nuclide name="Cr-53" ao="7.2104e-06" />
-    <nuclide name="Cr-54" ao="1.7948e-06" />
-    <nuclide name="Fe-54" ao="8.6728e-06" />
-    <nuclide name="Fe-56" ao="1.3614e-04" />
-    <nuclide name="Fe-57" ao="3.1442e-06" />
-    <nuclide name="Fe-58" ao="4.1843e-07" />
-    <nuclide name="Zr-90" ao="2.2114e-02" />
-    <nuclide name="Zr-91" ao="4.8226e-03" />
-    <nuclide name="Zr-92" ao="7.3714e-03" />
-    <nuclide name="Zr-94" ao="7.4703e-03" />
-    <nuclide name="Zr-96" ao="1.2035e-03" />
+    <nuclide name="Cr50" ao="3.2975e-06" />
+    <nuclide name="Cr52" ao="6.3588e-05" />
+    <nuclide name="Cr53" ao="7.2104e-06" />
+    <nuclide name="Cr54" ao="1.7948e-06" />
+    <nuclide name="Fe54" ao="8.6728e-06" />
+    <nuclide name="Fe56" ao="1.3614e-04" />
+    <nuclide name="Fe57" ao="3.1442e-06" />
+    <nuclide name="Fe58" ao="4.1843e-07" />
+    <nuclide name="Zr90" ao="2.2114e-02" />
+    <nuclide name="Zr91" ao="4.8226e-03" />
+    <nuclide name="Zr92" ao="7.3714e-03" />
+    <nuclide name="Zr94" ao="7.4703e-03" />
+    <nuclide name="Zr96" ao="1.2035e-03" />
   </material>
 
   <!-- ====================== Fresh fuels =========================== -->
@@ -45,29 +45,29 @@
   <!-- EU45: UO2, 4.5wt% enriched -->
   <material id="3">
     <density value="0.0693284852" units="atom/b-cm" />
-    <nuclide name="U-234" ao="8.4100e-06" />
-    <nuclide name="U-235" ao="1.0526e-03" />
-    <nuclide name="U-236" ao="6.4752e-06" />
-    <nuclide name="U-238" ao="2.2042e-02" />
-    <nuclide name="O-16"  ao="4.6219e-02" />
+    <nuclide name="U234" ao="8.4100e-06" />
+    <nuclide name="U235" ao="1.0526e-03" />
+    <nuclide name="U236" ao="6.4752e-06" />
+    <nuclide name="U238" ao="2.2042e-02" />
+    <nuclide name="O16"  ao="4.6219e-02" />
   </material>
 
   <!-- EU40: UO2, 4.0wt% enriched -->
   <material id="4">
     <density value="0.0696080381" units="atom/b-cm" />
-    <nuclide name="U-234" ao="7.5481e-06" />
-    <nuclide name="U-235" ao="9.3949e-04" />
-    <nuclide name="U-238" ao="2.2256e-02" />
-    <nuclide name="O-16"  ao="4.6405e-02" />
+    <nuclide name="U234" ao="7.5481e-06" />
+    <nuclide name="U235" ao="9.3949e-04" />
+    <nuclide name="U238" ao="2.2256e-02" />
+    <nuclide name="O16"  ao="4.6405e-02" />
   </material>
 
   <!-- NU: UO2, Natural uranium   -->
   <material id="5">
     <density value="0.0695822757" units="atom/b-cm" />
-    <nuclide name="U-234" ao="1.2757e-06" />
-    <nuclide name="U-235" ao="1.6700e-04" />
-    <nuclide name="U-238" ao="2.3026e-02" />
-    <nuclide name="O-16"  ao="4.6388e-02" />
+    <nuclide name="U234" ao="1.2757e-06" />
+    <nuclide name="U235" ao="1.6700e-04" />
+    <nuclide name="U238" ao="2.3026e-02" />
+    <nuclide name="O16"  ao="4.6388e-02" />
   </material>
 
   <!-- ===================== Burnup fuels =========================== -->
@@ -75,166 +75,166 @@
   <!-- B21G, EU45, 21.570 GWD/MTU -->
   <material id="6">
     <density value="0.0690055" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="6.4862e-06" />
-    <nuclide name="U-235"  ao="5.6758e-04" />
-    <nuclide name="U-236"  ao="9.4556e-05" />
-    <nuclide name="U-238"  ao="2.1732e-02" />
-    <nuclide name="Pu-238" ao="1.1322e-06" />
-    <nuclide name="Pu-239" ao="1.2591e-04" />
-    <nuclide name="Pu-240" ao="2.6395e-05" />
-    <nuclide name="Pu-241" ao="1.3614e-05" />
-    <nuclide name="Pu-242" ao="2.2623e-06" />
-    <nuclide name="Am-241" ao="4.0266e-06" />
-    <nuclide name="Am-243" ao="2.6222e-07" />
-    <nuclide name="Np-237" ao="6.8089e-06" />
-    <nuclide name="Mo-95"  ao="3.1530e-05" />
-    <nuclide name="Tc-99"  ao="3.0319e-05" />
-    <nuclide name="Ru-101" ao="2.7452e-05" />
-    <nuclide name="Rh-103" ao="1.7260e-05" />
-    <nuclide name="Ag-109" ao="1.8879e-06" />
-    <nuclide name="Cs-133" ao="3.3140e-05" />
-    <nuclide name="Sm-147" ao="6.4488e-06" />
-    <nuclide name="Sm-149" ao="1.9390e-07" />
-    <nuclide name="Sm-150" ao="7.1174e-06" />
-    <nuclide name="Sm-151" ao="5.7531e-07" />
-    <nuclide name="Sm-152" ao="3.0178e-06" />
-    <nuclide name="Nd-143" ao="2.5793e-05" />
-    <nuclide name="Nd-145" ao="1.8633e-05" />
-    <nuclide name="Eu-153" ao="2.0026e-06" />
-    <nuclide name="Gd-155" ao="1.1986e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="6.4862e-06" />
+    <nuclide name="U235"  ao="5.6758e-04" />
+    <nuclide name="U236"  ao="9.4556e-05" />
+    <nuclide name="U238"  ao="2.1732e-02" />
+    <nuclide name="Pu238" ao="1.1322e-06" />
+    <nuclide name="Pu239" ao="1.2591e-04" />
+    <nuclide name="Pu240" ao="2.6395e-05" />
+    <nuclide name="Pu241" ao="1.3614e-05" />
+    <nuclide name="Pu242" ao="2.2623e-06" />
+    <nuclide name="Am241" ao="4.0266e-06" />
+    <nuclide name="Am243" ao="2.6222e-07" />
+    <nuclide name="Np237" ao="6.8089e-06" />
+    <nuclide name="Mo95"  ao="3.1530e-05" />
+    <nuclide name="Tc99"  ao="3.0319e-05" />
+    <nuclide name="Ru101" ao="2.7452e-05" />
+    <nuclide name="Rh103" ao="1.7260e-05" />
+    <nuclide name="Ag109" ao="1.8879e-06" />
+    <nuclide name="Cs133" ao="3.3140e-05" />
+    <nuclide name="Sm147" ao="6.4488e-06" />
+    <nuclide name="Sm149" ao="1.9390e-07" />
+    <nuclide name="Sm150" ao="7.1174e-06" />
+    <nuclide name="Sm151" ao="5.7531e-07" />
+    <nuclide name="Sm152" ao="3.0178e-06" />
+    <nuclide name="Nd143" ao="2.5793e-05" />
+    <nuclide name="Nd145" ao="1.8633e-05" />
+    <nuclide name="Eu153" ao="2.0026e-06" />
+    <nuclide name="Gd155" ao="1.1986e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B24G, EU45, 24.023 GWD/MTU -->
   <material id="7">
     <density value="0.0689673" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="6.2881e-06" />
-    <nuclide name="U-235"  ao="5.2562e-04" />
-    <nuclide name="U-236"  ao="1.0155e-04" />
-    <nuclide name="U-238"  ao="2.1693e-02" />
-    <nuclide name="Pu-238" ao="1.4876e-06" />
-    <nuclide name="Pu-239" ao="1.3161e-04" />
-    <nuclide name="Pu-240" ao="2.9965e-05" />
-    <nuclide name="Pu-241" ao="1.5953e-05" />
-    <nuclide name="Pu-242" ao="3.0335e-06" />
-    <nuclide name="Am-241" ao="4.7603e-06" />
-    <nuclide name="Am-243" ao="3.9809e-07" />
-    <nuclide name="Np-237" ao="7.9041e-06" />
-    <nuclide name="Mo-95"  ao="3.4781e-05" />
-    <nuclide name="Tc-99"  ao="3.3465e-05" />
-    <nuclide name="Ru-101" ao="3.0548e-05" />
-    <nuclide name="Rh-103" ao="1.9008e-05" />
-    <nuclide name="Ag-109" ao="2.2230e-06" />
-    <nuclide name="Cs-133" ao="3.6549e-05" />
-    <nuclide name="Sm-147" ao="6.9339e-06" />
-    <nuclide name="Sm-149" ao="1.9611e-07" />
-    <nuclide name="Sm-150" ao="8.0472e-06" />
-    <nuclide name="Sm-151" ao="6.0064e-07" />
-    <nuclide name="Sm-152" ao="3.3473e-06" />
-    <nuclide name="Nd-143" ao="2.8067e-05" />
-    <nuclide name="Nd-145" ao="2.0504e-05" />
-    <nuclide name="Eu-153" ao="2.3329e-06" />
-    <nuclide name="Gd-155" ao="1.4386e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="6.2881e-06" />
+    <nuclide name="U235"  ao="5.2562e-04" />
+    <nuclide name="U236"  ao="1.0155e-04" />
+    <nuclide name="U238"  ao="2.1693e-02" />
+    <nuclide name="Pu238" ao="1.4876e-06" />
+    <nuclide name="Pu239" ao="1.3161e-04" />
+    <nuclide name="Pu240" ao="2.9965e-05" />
+    <nuclide name="Pu241" ao="1.5953e-05" />
+    <nuclide name="Pu242" ao="3.0335e-06" />
+    <nuclide name="Am241" ao="4.7603e-06" />
+    <nuclide name="Am243" ao="3.9809e-07" />
+    <nuclide name="Np237" ao="7.9041e-06" />
+    <nuclide name="Mo95"  ao="3.4781e-05" />
+    <nuclide name="Tc99"  ao="3.3465e-05" />
+    <nuclide name="Ru101" ao="3.0548e-05" />
+    <nuclide name="Rh103" ao="1.9008e-05" />
+    <nuclide name="Ag109" ao="2.2230e-06" />
+    <nuclide name="Cs133" ao="3.6549e-05" />
+    <nuclide name="Sm147" ao="6.9339e-06" />
+    <nuclide name="Sm149" ao="1.9611e-07" />
+    <nuclide name="Sm150" ao="8.0472e-06" />
+    <nuclide name="Sm151" ao="6.0064e-07" />
+    <nuclide name="Sm152" ao="3.3473e-06" />
+    <nuclide name="Nd143" ao="2.8067e-05" />
+    <nuclide name="Nd145" ao="2.0504e-05" />
+    <nuclide name="Eu153" ao="2.3329e-06" />
+    <nuclide name="Gd155" ao="1.4386e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B30G, EU45, 30.580 GWD/MTU -->
   <material id="8">
     <density value="0.0688634" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="5.7868e-06" />
-    <nuclide name="U-235"  ao="4.2455e-04" />
-    <nuclide name="U-236"  ao="1.1763e-04" />
-    <nuclide name="U-238"  ao="2.1585e-02" />
-    <nuclide name="Pu-238" ao="2.7262e-06" />
-    <nuclide name="Pu-239" ao="1.4249e-04" />
-    <nuclide name="Pu-240" ao="3.9140e-05" />
-    <nuclide name="Pu-241" ao="2.1863e-05" />
-    <nuclide name="Pu-242" ao="5.6472e-06" />
-    <nuclide name="Am-241" ao="6.6579e-06" />
-    <nuclide name="Am-243" ao="9.7353e-07" />
-    <nuclide name="Np-237" ao="1.0948e-05" />
-    <nuclide name="Mo-95"  ao="4.3130e-05" />
-    <nuclide name="Tc-99"  ao="4.1531e-05" />
-    <nuclide name="Ru-101" ao="3.8751e-05" />
-    <nuclide name="Rh-103" ao="2.3371e-05" />
-    <nuclide name="Ag-109" ao="3.1774e-06" />
-    <nuclide name="Cs-133" ao="4.5257e-05" />
-    <nuclide name="Sm-147" ao="8.0315e-06" />
-    <nuclide name="Sm-149" ao="1.9935e-07" />
-    <nuclide name="Sm-150" ao="1.0496e-05" />
-    <nuclide name="Sm-151" ao="6.6160e-07" />
-    <nuclide name="Sm-152" ao="4.1844e-06" />
-    <nuclide name="Nd-143" ao="3.3502e-05" />
-    <nuclide name="Nd-145" ao="2.5263e-05" />
-    <nuclide name="Eu-153" ao="3.2546e-06" />
-    <nuclide name="Gd-155" ao="2.2155e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="5.7868e-06" />
+    <nuclide name="U235"  ao="4.2455e-04" />
+    <nuclide name="U236"  ao="1.1763e-04" />
+    <nuclide name="U238"  ao="2.1585e-02" />
+    <nuclide name="Pu238" ao="2.7262e-06" />
+    <nuclide name="Pu239" ao="1.4249e-04" />
+    <nuclide name="Pu240" ao="3.9140e-05" />
+    <nuclide name="Pu241" ao="2.1863e-05" />
+    <nuclide name="Pu242" ao="5.6472e-06" />
+    <nuclide name="Am241" ao="6.6579e-06" />
+    <nuclide name="Am243" ao="9.7353e-07" />
+    <nuclide name="Np237" ao="1.0948e-05" />
+    <nuclide name="Mo95"  ao="4.3130e-05" />
+    <nuclide name="Tc99"  ao="4.1531e-05" />
+    <nuclide name="Ru101" ao="3.8751e-05" />
+    <nuclide name="Rh103" ao="2.3371e-05" />
+    <nuclide name="Ag109" ao="3.1774e-06" />
+    <nuclide name="Cs133" ao="4.5257e-05" />
+    <nuclide name="Sm147" ao="8.0315e-06" />
+    <nuclide name="Sm149" ao="1.9935e-07" />
+    <nuclide name="Sm150" ao="1.0496e-05" />
+    <nuclide name="Sm151" ao="6.6160e-07" />
+    <nuclide name="Sm152" ao="4.1844e-06" />
+    <nuclide name="Nd143" ao="3.3502e-05" />
+    <nuclide name="Nd145" ao="2.5263e-05" />
+    <nuclide name="Eu153" ao="3.2546e-06" />
+    <nuclide name="Gd155" ao="2.2155e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B40G, EU45, 40.424 GWD/MTU -->
   <material id="9">
     <density value="0.0687030" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="5.1152e-06" />
-    <nuclide name="U-235"  ao="3.0002e-04" />
-    <nuclide name="U-236"  ao="1.3534e-04" />
-    <nuclide name="U-238"  ao="2.1413e-02" />
-    <nuclide name="Pu-238" ao="5.3656e-06" />
-    <nuclide name="Pu-239" ao="1.5064e-04" />
-    <nuclide name="Pu-240" ao="5.1484e-05" />
-    <nuclide name="Pu-241" ao="2.9175e-05" />
-    <nuclide name="Pu-242" ao="1.0893e-05" />
-    <nuclide name="Am-241" ao="9.0866e-06" />
-    <nuclide name="Am-243" ao="2.5108e-06" />
-    <nuclide name="Np-237" ao="1.5602e-05" />
-    <nuclide name="Mo-95"  ao="5.4806e-05" />
-    <nuclide name="Tc-99"  ao="5.2746e-05" />
-    <nuclide name="Ru-101" ao="5.0881e-05" />
-    <nuclide name="Rh-103" ao="2.9057e-05" />
-    <nuclide name="Ag-109" ao="4.7134e-06" />
-    <nuclide name="Cs-133" ao="5.7263e-05" />
-    <nuclide name="Sm-147" ao="9.2075e-06" />
-    <nuclide name="Sm-149" ao="1.9993e-07" />
-    <nuclide name="Sm-150" ao="1.3997e-05" />
-    <nuclide name="Sm-151" ao="7.3765e-07" />
-    <nuclide name="Sm-152" ao="5.3316e-06" />
-    <nuclide name="Nd-143" ao="3.9984e-05" />
-    <nuclide name="Nd-145" ao="3.1783e-05" />
-    <nuclide name="Eu-153" ao="4.6705e-06" />
-    <nuclide name="Gd-155" ao="3.6871e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="5.1152e-06" />
+    <nuclide name="U235"  ao="3.0002e-04" />
+    <nuclide name="U236"  ao="1.3534e-04" />
+    <nuclide name="U238"  ao="2.1413e-02" />
+    <nuclide name="Pu238" ao="5.3656e-06" />
+    <nuclide name="Pu239" ao="1.5064e-04" />
+    <nuclide name="Pu240" ao="5.1484e-05" />
+    <nuclide name="Pu241" ao="2.9175e-05" />
+    <nuclide name="Pu242" ao="1.0893e-05" />
+    <nuclide name="Am241" ao="9.0866e-06" />
+    <nuclide name="Am243" ao="2.5108e-06" />
+    <nuclide name="Np237" ao="1.5602e-05" />
+    <nuclide name="Mo95"  ao="5.4806e-05" />
+    <nuclide name="Tc99"  ao="5.2746e-05" />
+    <nuclide name="Ru101" ao="5.0881e-05" />
+    <nuclide name="Rh103" ao="2.9057e-05" />
+    <nuclide name="Ag109" ao="4.7134e-06" />
+    <nuclide name="Cs133" ao="5.7263e-05" />
+    <nuclide name="Sm147" ao="9.2075e-06" />
+    <nuclide name="Sm149" ao="1.9993e-07" />
+    <nuclide name="Sm150" ao="1.3997e-05" />
+    <nuclide name="Sm151" ao="7.3765e-07" />
+    <nuclide name="Sm152" ao="5.3316e-06" />
+    <nuclide name="Nd143" ao="3.9984e-05" />
+    <nuclide name="Nd145" ao="3.1783e-05" />
+    <nuclide name="Eu153" ao="4.6705e-06" />
+    <nuclide name="Gd155" ao="3.6871e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B40G, EU55, 54.605 GWD/MTU -->
   <material id="10">
     <density value="0.06845907" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="4.3280e-06" />
-    <nuclide name="U-235"  ao="1.7108e-04" />
-    <nuclide name="U-236"  ao="1.4897e-04" />
-    <nuclide name="U-238"  ao="2.1142e-02" />
-    <nuclide name="Pu-238" ao="1.0471e-05" />
-    <nuclide name="Pu-239" ao="1.5300e-04" />
-    <nuclide name="Pu-240" ao="6.5540e-05" />
-    <nuclide name="Pu-241" ao="3.6032e-05" />
-    <nuclide name="Pu-242" ao="2.0303e-05" />
-    <nuclide name="Am-241" ao="1.1405e-05" />
-    <nuclide name="Am-243" ao="6.1550e-06" />
-    <nuclide name="Np-237" ao="2.1806e-05" />
-    <nuclide name="Mo-95"  ao="6.9892e-05" />
-    <nuclide name="Tc-99"  ao="6.6975e-05" />
-    <nuclide name="Ru-101" ao="6.7875e-05" />
-    <nuclide name="Rh-103" ao="3.5406e-05" />
-    <nuclide name="Ag-109" ao="6.9836e-06" />
-    <nuclide name="Cs-133" ao="7.2263e-05" />
-    <nuclide name="Sm-147" ao="1.0106e-05" />
-    <nuclide name="Sm-149" ao="1.9259e-07" />
-    <nuclide name="Sm-150" ao="1.8627e-05" />
-    <nuclide name="Sm-151" ao="8.1779e-07" />
-    <nuclide name="Sm-152" ao="6.7637e-06" />
-    <nuclide name="Nd-143" ao="4.5992e-05" />
-    <nuclide name="Nd-145" ao="3.9892e-05" />
-    <nuclide name="Eu-153" ao="6.5858e-06" />
-    <nuclide name="Gd-155" ao="6.0862e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="4.3280e-06" />
+    <nuclide name="U235"  ao="1.7108e-04" />
+    <nuclide name="U236"  ao="1.4897e-04" />
+    <nuclide name="U238"  ao="2.1142e-02" />
+    <nuclide name="Pu238" ao="1.0471e-05" />
+    <nuclide name="Pu239" ao="1.5300e-04" />
+    <nuclide name="Pu240" ao="6.5540e-05" />
+    <nuclide name="Pu241" ao="3.6032e-05" />
+    <nuclide name="Pu242" ao="2.0303e-05" />
+    <nuclide name="Am241" ao="1.1405e-05" />
+    <nuclide name="Am243" ao="6.1550e-06" />
+    <nuclide name="Np237" ao="2.1806e-05" />
+    <nuclide name="Mo95"  ao="6.9892e-05" />
+    <nuclide name="Tc99"  ao="6.6975e-05" />
+    <nuclide name="Ru101" ao="6.7875e-05" />
+    <nuclide name="Rh103" ao="3.5406e-05" />
+    <nuclide name="Ag109" ao="6.9836e-06" />
+    <nuclide name="Cs133" ao="7.2263e-05" />
+    <nuclide name="Sm147" ao="1.0106e-05" />
+    <nuclide name="Sm149" ao="1.9259e-07" />
+    <nuclide name="Sm150" ao="1.8627e-05" />
+    <nuclide name="Sm151" ao="8.1779e-07" />
+    <nuclide name="Sm152" ao="6.7637e-06" />
+    <nuclide name="Nd143" ao="4.5992e-05" />
+    <nuclide name="Nd145" ao="3.9892e-05" />
+    <nuclide name="Eu153" ao="6.5858e-06" />
+    <nuclide name="Gd155" ao="6.0862e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
 </materials>
diff --git a/source-convergence/benchmark-2/openmc/case2_1/materials.xml b/source-convergence/benchmark-2/openmc/case2_1/materials.xml
index fcd752d..0d01152 100644
--- a/source-convergence/benchmark-2/openmc/case2_1/materials.xml
+++ b/source-convergence/benchmark-2/openmc/case2_1/materials.xml
@@ -17,27 +17,27 @@
   <!-- Water, 25 deg.C -->
   <material id="1">
     <density value="0.099987" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="6.6658e-02" />
-    <nuclide name="O-16" ao="3.3329e-02" />
-    <sab name="HH2O" xs="71t" />
+    <nuclide name="H1"  ao="6.6658e-02" />
+    <nuclide name="O16" ao="3.3329e-02" />
+    <sab name="c_H_in_H2O" />
   </material>
 
   <!-- Zircaloy-4 -->
   <material id="2">
     <density value="0.043206271" units="atom/b-cm" />
-    <nuclide name="Cr-50" ao="3.2975e-06" />
-    <nuclide name="Cr-52" ao="6.3588e-05" />
-    <nuclide name="Cr-53" ao="7.2104e-06" />
-    <nuclide name="Cr-54" ao="1.7948e-06" />
-    <nuclide name="Fe-54" ao="8.6728e-06" />
-    <nuclide name="Fe-56" ao="1.3614e-04" />
-    <nuclide name="Fe-57" ao="3.1442e-06" />
-    <nuclide name="Fe-58" ao="4.1843e-07" />
-    <nuclide name="Zr-90" ao="2.2114e-02" />
-    <nuclide name="Zr-91" ao="4.8226e-03" />
-    <nuclide name="Zr-92" ao="7.3714e-03" />
-    <nuclide name="Zr-94" ao="7.4703e-03" />
-    <nuclide name="Zr-96" ao="1.2035e-03" />
+    <nuclide name="Cr50" ao="3.2975e-06" />
+    <nuclide name="Cr52" ao="6.3588e-05" />
+    <nuclide name="Cr53" ao="7.2104e-06" />
+    <nuclide name="Cr54" ao="1.7948e-06" />
+    <nuclide name="Fe54" ao="8.6728e-06" />
+    <nuclide name="Fe56" ao="1.3614e-04" />
+    <nuclide name="Fe57" ao="3.1442e-06" />
+    <nuclide name="Fe58" ao="4.1843e-07" />
+    <nuclide name="Zr90" ao="2.2114e-02" />
+    <nuclide name="Zr91" ao="4.8226e-03" />
+    <nuclide name="Zr92" ao="7.3714e-03" />
+    <nuclide name="Zr94" ao="7.4703e-03" />
+    <nuclide name="Zr96" ao="1.2035e-03" />
   </material>
 
   <!-- ====================== Fresh fuels =========================== -->
@@ -45,29 +45,29 @@
   <!-- EU45: UO2, 4.5wt% enriched -->
   <material id="3">
     <density value="0.0693284852" units="atom/b-cm" />
-    <nuclide name="U-234" ao="8.4100e-06" />
-    <nuclide name="U-235" ao="1.0526e-03" />
-    <nuclide name="U-236" ao="6.4752e-06" />
-    <nuclide name="U-238" ao="2.2042e-02" />
-    <nuclide name="O-16"  ao="4.6219e-02" />
+    <nuclide name="U234" ao="8.4100e-06" />
+    <nuclide name="U235" ao="1.0526e-03" />
+    <nuclide name="U236" ao="6.4752e-06" />
+    <nuclide name="U238" ao="2.2042e-02" />
+    <nuclide name="O16"  ao="4.6219e-02" />
   </material>
 
   <!-- EU40: UO2, 4.0wt% enriched -->
   <material id="4">
     <density value="0.0696080381" units="atom/b-cm" />
-    <nuclide name="U-234" ao="7.5481e-06" />
-    <nuclide name="U-235" ao="9.3949e-04" />
-    <nuclide name="U-238" ao="2.2256e-02" />
-    <nuclide name="O-16"  ao="4.6405e-02" />
+    <nuclide name="U234" ao="7.5481e-06" />
+    <nuclide name="U235" ao="9.3949e-04" />
+    <nuclide name="U238" ao="2.2256e-02" />
+    <nuclide name="O16"  ao="4.6405e-02" />
   </material>
 
   <!-- NU: UO2, Natural uranium   -->
   <material id="5">
     <density value="0.0695822757" units="atom/b-cm" />
-    <nuclide name="U-234" ao="1.2757e-06" />
-    <nuclide name="U-235" ao="1.6700e-04" />
-    <nuclide name="U-238" ao="2.3026e-02" />
-    <nuclide name="O-16"  ao="4.6388e-02" />
+    <nuclide name="U234" ao="1.2757e-06" />
+    <nuclide name="U235" ao="1.6700e-04" />
+    <nuclide name="U238" ao="2.3026e-02" />
+    <nuclide name="O16"  ao="4.6388e-02" />
   </material>
 
   <!-- ===================== Burnup fuels =========================== -->
@@ -75,166 +75,166 @@
   <!-- B21G, EU45, 21.570 GWD/MTU -->
   <material id="6">
     <density value="0.0690055" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="6.4862e-06" />
-    <nuclide name="U-235"  ao="5.6758e-04" />
-    <nuclide name="U-236"  ao="9.4556e-05" />
-    <nuclide name="U-238"  ao="2.1732e-02" />
-    <nuclide name="Pu-238" ao="1.1322e-06" />
-    <nuclide name="Pu-239" ao="1.2591e-04" />
-    <nuclide name="Pu-240" ao="2.6395e-05" />
-    <nuclide name="Pu-241" ao="1.3614e-05" />
-    <nuclide name="Pu-242" ao="2.2623e-06" />
-    <nuclide name="Am-241" ao="4.0266e-06" />
-    <nuclide name="Am-243" ao="2.6222e-07" />
-    <nuclide name="Np-237" ao="6.8089e-06" />
-    <nuclide name="Mo-95"  ao="3.1530e-05" />
-    <nuclide name="Tc-99"  ao="3.0319e-05" />
-    <nuclide name="Ru-101" ao="2.7452e-05" />
-    <nuclide name="Rh-103" ao="1.7260e-05" />
-    <nuclide name="Ag-109" ao="1.8879e-06" />
-    <nuclide name="Cs-133" ao="3.3140e-05" />
-    <nuclide name="Sm-147" ao="6.4488e-06" />
-    <nuclide name="Sm-149" ao="1.9390e-07" />
-    <nuclide name="Sm-150" ao="7.1174e-06" />
-    <nuclide name="Sm-151" ao="5.7531e-07" />
-    <nuclide name="Sm-152" ao="3.0178e-06" />
-    <nuclide name="Nd-143" ao="2.5793e-05" />
-    <nuclide name="Nd-145" ao="1.8633e-05" />
-    <nuclide name="Eu-153" ao="2.0026e-06" />
-    <nuclide name="Gd-155" ao="1.1986e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="6.4862e-06" />
+    <nuclide name="U235"  ao="5.6758e-04" />
+    <nuclide name="U236"  ao="9.4556e-05" />
+    <nuclide name="U238"  ao="2.1732e-02" />
+    <nuclide name="Pu238" ao="1.1322e-06" />
+    <nuclide name="Pu239" ao="1.2591e-04" />
+    <nuclide name="Pu240" ao="2.6395e-05" />
+    <nuclide name="Pu241" ao="1.3614e-05" />
+    <nuclide name="Pu242" ao="2.2623e-06" />
+    <nuclide name="Am241" ao="4.0266e-06" />
+    <nuclide name="Am243" ao="2.6222e-07" />
+    <nuclide name="Np237" ao="6.8089e-06" />
+    <nuclide name="Mo95"  ao="3.1530e-05" />
+    <nuclide name="Tc99"  ao="3.0319e-05" />
+    <nuclide name="Ru101" ao="2.7452e-05" />
+    <nuclide name="Rh103" ao="1.7260e-05" />
+    <nuclide name="Ag109" ao="1.8879e-06" />
+    <nuclide name="Cs133" ao="3.3140e-05" />
+    <nuclide name="Sm147" ao="6.4488e-06" />
+    <nuclide name="Sm149" ao="1.9390e-07" />
+    <nuclide name="Sm150" ao="7.1174e-06" />
+    <nuclide name="Sm151" ao="5.7531e-07" />
+    <nuclide name="Sm152" ao="3.0178e-06" />
+    <nuclide name="Nd143" ao="2.5793e-05" />
+    <nuclide name="Nd145" ao="1.8633e-05" />
+    <nuclide name="Eu153" ao="2.0026e-06" />
+    <nuclide name="Gd155" ao="1.1986e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B24G, EU45, 24.023 GWD/MTU -->
   <material id="7">
     <density value="0.0689673" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="6.2881e-06" />
-    <nuclide name="U-235"  ao="5.2562e-04" />
-    <nuclide name="U-236"  ao="1.0155e-04" />
-    <nuclide name="U-238"  ao="2.1693e-02" />
-    <nuclide name="Pu-238" ao="1.4876e-06" />
-    <nuclide name="Pu-239" ao="1.3161e-04" />
-    <nuclide name="Pu-240" ao="2.9965e-05" />
-    <nuclide name="Pu-241" ao="1.5953e-05" />
-    <nuclide name="Pu-242" ao="3.0335e-06" />
-    <nuclide name="Am-241" ao="4.7603e-06" />
-    <nuclide name="Am-243" ao="3.9809e-07" />
-    <nuclide name="Np-237" ao="7.9041e-06" />
-    <nuclide name="Mo-95"  ao="3.4781e-05" />
-    <nuclide name="Tc-99"  ao="3.3465e-05" />
-    <nuclide name="Ru-101" ao="3.0548e-05" />
-    <nuclide name="Rh-103" ao="1.9008e-05" />
-    <nuclide name="Ag-109" ao="2.2230e-06" />
-    <nuclide name="Cs-133" ao="3.6549e-05" />
-    <nuclide name="Sm-147" ao="6.9339e-06" />
-    <nuclide name="Sm-149" ao="1.9611e-07" />
-    <nuclide name="Sm-150" ao="8.0472e-06" />
-    <nuclide name="Sm-151" ao="6.0064e-07" />
-    <nuclide name="Sm-152" ao="3.3473e-06" />
-    <nuclide name="Nd-143" ao="2.8067e-05" />
-    <nuclide name="Nd-145" ao="2.0504e-05" />
-    <nuclide name="Eu-153" ao="2.3329e-06" />
-    <nuclide name="Gd-155" ao="1.4386e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="6.2881e-06" />
+    <nuclide name="U235"  ao="5.2562e-04" />
+    <nuclide name="U236"  ao="1.0155e-04" />
+    <nuclide name="U238"  ao="2.1693e-02" />
+    <nuclide name="Pu238" ao="1.4876e-06" />
+    <nuclide name="Pu239" ao="1.3161e-04" />
+    <nuclide name="Pu240" ao="2.9965e-05" />
+    <nuclide name="Pu241" ao="1.5953e-05" />
+    <nuclide name="Pu242" ao="3.0335e-06" />
+    <nuclide name="Am241" ao="4.7603e-06" />
+    <nuclide name="Am243" ao="3.9809e-07" />
+    <nuclide name="Np237" ao="7.9041e-06" />
+    <nuclide name="Mo95"  ao="3.4781e-05" />
+    <nuclide name="Tc99"  ao="3.3465e-05" />
+    <nuclide name="Ru101" ao="3.0548e-05" />
+    <nuclide name="Rh103" ao="1.9008e-05" />
+    <nuclide name="Ag109" ao="2.2230e-06" />
+    <nuclide name="Cs133" ao="3.6549e-05" />
+    <nuclide name="Sm147" ao="6.9339e-06" />
+    <nuclide name="Sm149" ao="1.9611e-07" />
+    <nuclide name="Sm150" ao="8.0472e-06" />
+    <nuclide name="Sm151" ao="6.0064e-07" />
+    <nuclide name="Sm152" ao="3.3473e-06" />
+    <nuclide name="Nd143" ao="2.8067e-05" />
+    <nuclide name="Nd145" ao="2.0504e-05" />
+    <nuclide name="Eu153" ao="2.3329e-06" />
+    <nuclide name="Gd155" ao="1.4386e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B30G, EU45, 30.580 GWD/MTU -->
   <material id="8">
     <density value="0.0688634" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="5.7868e-06" />
-    <nuclide name="U-235"  ao="4.2455e-04" />
-    <nuclide name="U-236"  ao="1.1763e-04" />
-    <nuclide name="U-238"  ao="2.1585e-02" />
-    <nuclide name="Pu-238" ao="2.7262e-06" />
-    <nuclide name="Pu-239" ao="1.4249e-04" />
-    <nuclide name="Pu-240" ao="3.9140e-05" />
-    <nuclide name="Pu-241" ao="2.1863e-05" />
-    <nuclide name="Pu-242" ao="5.6472e-06" />
-    <nuclide name="Am-241" ao="6.6579e-06" />
-    <nuclide name="Am-243" ao="9.7353e-07" />
-    <nuclide name="Np-237" ao="1.0948e-05" />
-    <nuclide name="Mo-95"  ao="4.3130e-05" />
-    <nuclide name="Tc-99"  ao="4.1531e-05" />
-    <nuclide name="Ru-101" ao="3.8751e-05" />
-    <nuclide name="Rh-103" ao="2.3371e-05" />
-    <nuclide name="Ag-109" ao="3.1774e-06" />
-    <nuclide name="Cs-133" ao="4.5257e-05" />
-    <nuclide name="Sm-147" ao="8.0315e-06" />
-    <nuclide name="Sm-149" ao="1.9935e-07" />
-    <nuclide name="Sm-150" ao="1.0496e-05" />
-    <nuclide name="Sm-151" ao="6.6160e-07" />
-    <nuclide name="Sm-152" ao="4.1844e-06" />
-    <nuclide name="Nd-143" ao="3.3502e-05" />
-    <nuclide name="Nd-145" ao="2.5263e-05" />
-    <nuclide name="Eu-153" ao="3.2546e-06" />
-    <nuclide name="Gd-155" ao="2.2155e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="5.7868e-06" />
+    <nuclide name="U235"  ao="4.2455e-04" />
+    <nuclide name="U236"  ao="1.1763e-04" />
+    <nuclide name="U238"  ao="2.1585e-02" />
+    <nuclide name="Pu238" ao="2.7262e-06" />
+    <nuclide name="Pu239" ao="1.4249e-04" />
+    <nuclide name="Pu240" ao="3.9140e-05" />
+    <nuclide name="Pu241" ao="2.1863e-05" />
+    <nuclide name="Pu242" ao="5.6472e-06" />
+    <nuclide name="Am241" ao="6.6579e-06" />
+    <nuclide name="Am243" ao="9.7353e-07" />
+    <nuclide name="Np237" ao="1.0948e-05" />
+    <nuclide name="Mo95"  ao="4.3130e-05" />
+    <nuclide name="Tc99"  ao="4.1531e-05" />
+    <nuclide name="Ru101" ao="3.8751e-05" />
+    <nuclide name="Rh103" ao="2.3371e-05" />
+    <nuclide name="Ag109" ao="3.1774e-06" />
+    <nuclide name="Cs133" ao="4.5257e-05" />
+    <nuclide name="Sm147" ao="8.0315e-06" />
+    <nuclide name="Sm149" ao="1.9935e-07" />
+    <nuclide name="Sm150" ao="1.0496e-05" />
+    <nuclide name="Sm151" ao="6.6160e-07" />
+    <nuclide name="Sm152" ao="4.1844e-06" />
+    <nuclide name="Nd143" ao="3.3502e-05" />
+    <nuclide name="Nd145" ao="2.5263e-05" />
+    <nuclide name="Eu153" ao="3.2546e-06" />
+    <nuclide name="Gd155" ao="2.2155e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B40G, EU45, 40.424 GWD/MTU -->
   <material id="9">
     <density value="0.0687030" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="5.1152e-06" />
-    <nuclide name="U-235"  ao="3.0002e-04" />
-    <nuclide name="U-236"  ao="1.3534e-04" />
-    <nuclide name="U-238"  ao="2.1413e-02" />
-    <nuclide name="Pu-238" ao="5.3656e-06" />
-    <nuclide name="Pu-239" ao="1.5064e-04" />
-    <nuclide name="Pu-240" ao="5.1484e-05" />
-    <nuclide name="Pu-241" ao="2.9175e-05" />
-    <nuclide name="Pu-242" ao="1.0893e-05" />
-    <nuclide name="Am-241" ao="9.0866e-06" />
-    <nuclide name="Am-243" ao="2.5108e-06" />
-    <nuclide name="Np-237" ao="1.5602e-05" />
-    <nuclide name="Mo-95"  ao="5.4806e-05" />
-    <nuclide name="Tc-99"  ao="5.2746e-05" />
-    <nuclide name="Ru-101" ao="5.0881e-05" />
-    <nuclide name="Rh-103" ao="2.9057e-05" />
-    <nuclide name="Ag-109" ao="4.7134e-06" />
-    <nuclide name="Cs-133" ao="5.7263e-05" />
-    <nuclide name="Sm-147" ao="9.2075e-06" />
-    <nuclide name="Sm-149" ao="1.9993e-07" />
-    <nuclide name="Sm-150" ao="1.3997e-05" />
-    <nuclide name="Sm-151" ao="7.3765e-07" />
-    <nuclide name="Sm-152" ao="5.3316e-06" />
-    <nuclide name="Nd-143" ao="3.9984e-05" />
-    <nuclide name="Nd-145" ao="3.1783e-05" />
-    <nuclide name="Eu-153" ao="4.6705e-06" />
-    <nuclide name="Gd-155" ao="3.6871e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="5.1152e-06" />
+    <nuclide name="U235"  ao="3.0002e-04" />
+    <nuclide name="U236"  ao="1.3534e-04" />
+    <nuclide name="U238"  ao="2.1413e-02" />
+    <nuclide name="Pu238" ao="5.3656e-06" />
+    <nuclide name="Pu239" ao="1.5064e-04" />
+    <nuclide name="Pu240" ao="5.1484e-05" />
+    <nuclide name="Pu241" ao="2.9175e-05" />
+    <nuclide name="Pu242" ao="1.0893e-05" />
+    <nuclide name="Am241" ao="9.0866e-06" />
+    <nuclide name="Am243" ao="2.5108e-06" />
+    <nuclide name="Np237" ao="1.5602e-05" />
+    <nuclide name="Mo95"  ao="5.4806e-05" />
+    <nuclide name="Tc99"  ao="5.2746e-05" />
+    <nuclide name="Ru101" ao="5.0881e-05" />
+    <nuclide name="Rh103" ao="2.9057e-05" />
+    <nuclide name="Ag109" ao="4.7134e-06" />
+    <nuclide name="Cs133" ao="5.7263e-05" />
+    <nuclide name="Sm147" ao="9.2075e-06" />
+    <nuclide name="Sm149" ao="1.9993e-07" />
+    <nuclide name="Sm150" ao="1.3997e-05" />
+    <nuclide name="Sm151" ao="7.3765e-07" />
+    <nuclide name="Sm152" ao="5.3316e-06" />
+    <nuclide name="Nd143" ao="3.9984e-05" />
+    <nuclide name="Nd145" ao="3.1783e-05" />
+    <nuclide name="Eu153" ao="4.6705e-06" />
+    <nuclide name="Gd155" ao="3.6871e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B40G, EU55, 54.605 GWD/MTU -->
   <material id="10">
     <density value="0.06845907" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="4.3280e-06" />
-    <nuclide name="U-235"  ao="1.7108e-04" />
-    <nuclide name="U-236"  ao="1.4897e-04" />
-    <nuclide name="U-238"  ao="2.1142e-02" />
-    <nuclide name="Pu-238" ao="1.0471e-05" />
-    <nuclide name="Pu-239" ao="1.5300e-04" />
-    <nuclide name="Pu-240" ao="6.5540e-05" />
-    <nuclide name="Pu-241" ao="3.6032e-05" />
-    <nuclide name="Pu-242" ao="2.0303e-05" />
-    <nuclide name="Am-241" ao="1.1405e-05" />
-    <nuclide name="Am-243" ao="6.1550e-06" />
-    <nuclide name="Np-237" ao="2.1806e-05" />
-    <nuclide name="Mo-95"  ao="6.9892e-05" />
-    <nuclide name="Tc-99"  ao="6.6975e-05" />
-    <nuclide name="Ru-101" ao="6.7875e-05" />
-    <nuclide name="Rh-103" ao="3.5406e-05" />
-    <nuclide name="Ag-109" ao="6.9836e-06" />
-    <nuclide name="Cs-133" ao="7.2263e-05" />
-    <nuclide name="Sm-147" ao="1.0106e-05" />
-    <nuclide name="Sm-149" ao="1.9259e-07" />
-    <nuclide name="Sm-150" ao="1.8627e-05" />
-    <nuclide name="Sm-151" ao="8.1779e-07" />
-    <nuclide name="Sm-152" ao="6.7637e-06" />
-    <nuclide name="Nd-143" ao="4.5992e-05" />
-    <nuclide name="Nd-145" ao="3.9892e-05" />
-    <nuclide name="Eu-153" ao="6.5858e-06" />
-    <nuclide name="Gd-155" ao="6.0862e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="4.3280e-06" />
+    <nuclide name="U235"  ao="1.7108e-04" />
+    <nuclide name="U236"  ao="1.4897e-04" />
+    <nuclide name="U238"  ao="2.1142e-02" />
+    <nuclide name="Pu238" ao="1.0471e-05" />
+    <nuclide name="Pu239" ao="1.5300e-04" />
+    <nuclide name="Pu240" ao="6.5540e-05" />
+    <nuclide name="Pu241" ao="3.6032e-05" />
+    <nuclide name="Pu242" ao="2.0303e-05" />
+    <nuclide name="Am241" ao="1.1405e-05" />
+    <nuclide name="Am243" ao="6.1550e-06" />
+    <nuclide name="Np237" ao="2.1806e-05" />
+    <nuclide name="Mo95"  ao="6.9892e-05" />
+    <nuclide name="Tc99"  ao="6.6975e-05" />
+    <nuclide name="Ru101" ao="6.7875e-05" />
+    <nuclide name="Rh103" ao="3.5406e-05" />
+    <nuclide name="Ag109" ao="6.9836e-06" />
+    <nuclide name="Cs133" ao="7.2263e-05" />
+    <nuclide name="Sm147" ao="1.0106e-05" />
+    <nuclide name="Sm149" ao="1.9259e-07" />
+    <nuclide name="Sm150" ao="1.8627e-05" />
+    <nuclide name="Sm151" ao="8.1779e-07" />
+    <nuclide name="Sm152" ao="6.7637e-06" />
+    <nuclide name="Nd143" ao="4.5992e-05" />
+    <nuclide name="Nd145" ao="3.9892e-05" />
+    <nuclide name="Eu153" ao="6.5858e-06" />
+    <nuclide name="Gd155" ao="6.0862e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
 </materials>
diff --git a/source-convergence/benchmark-2/openmc/case2_2/materials.xml b/source-convergence/benchmark-2/openmc/case2_2/materials.xml
index fcd752d..0d01152 100644
--- a/source-convergence/benchmark-2/openmc/case2_2/materials.xml
+++ b/source-convergence/benchmark-2/openmc/case2_2/materials.xml
@@ -17,27 +17,27 @@
   <!-- Water, 25 deg.C -->
   <material id="1">
     <density value="0.099987" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="6.6658e-02" />
-    <nuclide name="O-16" ao="3.3329e-02" />
-    <sab name="HH2O" xs="71t" />
+    <nuclide name="H1"  ao="6.6658e-02" />
+    <nuclide name="O16" ao="3.3329e-02" />
+    <sab name="c_H_in_H2O" />
   </material>
 
   <!-- Zircaloy-4 -->
   <material id="2">
     <density value="0.043206271" units="atom/b-cm" />
-    <nuclide name="Cr-50" ao="3.2975e-06" />
-    <nuclide name="Cr-52" ao="6.3588e-05" />
-    <nuclide name="Cr-53" ao="7.2104e-06" />
-    <nuclide name="Cr-54" ao="1.7948e-06" />
-    <nuclide name="Fe-54" ao="8.6728e-06" />
-    <nuclide name="Fe-56" ao="1.3614e-04" />
-    <nuclide name="Fe-57" ao="3.1442e-06" />
-    <nuclide name="Fe-58" ao="4.1843e-07" />
-    <nuclide name="Zr-90" ao="2.2114e-02" />
-    <nuclide name="Zr-91" ao="4.8226e-03" />
-    <nuclide name="Zr-92" ao="7.3714e-03" />
-    <nuclide name="Zr-94" ao="7.4703e-03" />
-    <nuclide name="Zr-96" ao="1.2035e-03" />
+    <nuclide name="Cr50" ao="3.2975e-06" />
+    <nuclide name="Cr52" ao="6.3588e-05" />
+    <nuclide name="Cr53" ao="7.2104e-06" />
+    <nuclide name="Cr54" ao="1.7948e-06" />
+    <nuclide name="Fe54" ao="8.6728e-06" />
+    <nuclide name="Fe56" ao="1.3614e-04" />
+    <nuclide name="Fe57" ao="3.1442e-06" />
+    <nuclide name="Fe58" ao="4.1843e-07" />
+    <nuclide name="Zr90" ao="2.2114e-02" />
+    <nuclide name="Zr91" ao="4.8226e-03" />
+    <nuclide name="Zr92" ao="7.3714e-03" />
+    <nuclide name="Zr94" ao="7.4703e-03" />
+    <nuclide name="Zr96" ao="1.2035e-03" />
   </material>
 
   <!-- ====================== Fresh fuels =========================== -->
@@ -45,29 +45,29 @@
   <!-- EU45: UO2, 4.5wt% enriched -->
   <material id="3">
     <density value="0.0693284852" units="atom/b-cm" />
-    <nuclide name="U-234" ao="8.4100e-06" />
-    <nuclide name="U-235" ao="1.0526e-03" />
-    <nuclide name="U-236" ao="6.4752e-06" />
-    <nuclide name="U-238" ao="2.2042e-02" />
-    <nuclide name="O-16"  ao="4.6219e-02" />
+    <nuclide name="U234" ao="8.4100e-06" />
+    <nuclide name="U235" ao="1.0526e-03" />
+    <nuclide name="U236" ao="6.4752e-06" />
+    <nuclide name="U238" ao="2.2042e-02" />
+    <nuclide name="O16"  ao="4.6219e-02" />
   </material>
 
   <!-- EU40: UO2, 4.0wt% enriched -->
   <material id="4">
     <density value="0.0696080381" units="atom/b-cm" />
-    <nuclide name="U-234" ao="7.5481e-06" />
-    <nuclide name="U-235" ao="9.3949e-04" />
-    <nuclide name="U-238" ao="2.2256e-02" />
-    <nuclide name="O-16"  ao="4.6405e-02" />
+    <nuclide name="U234" ao="7.5481e-06" />
+    <nuclide name="U235" ao="9.3949e-04" />
+    <nuclide name="U238" ao="2.2256e-02" />
+    <nuclide name="O16"  ao="4.6405e-02" />
   </material>
 
   <!-- NU: UO2, Natural uranium   -->
   <material id="5">
     <density value="0.0695822757" units="atom/b-cm" />
-    <nuclide name="U-234" ao="1.2757e-06" />
-    <nuclide name="U-235" ao="1.6700e-04" />
-    <nuclide name="U-238" ao="2.3026e-02" />
-    <nuclide name="O-16"  ao="4.6388e-02" />
+    <nuclide name="U234" ao="1.2757e-06" />
+    <nuclide name="U235" ao="1.6700e-04" />
+    <nuclide name="U238" ao="2.3026e-02" />
+    <nuclide name="O16"  ao="4.6388e-02" />
   </material>
 
   <!-- ===================== Burnup fuels =========================== -->
@@ -75,166 +75,166 @@
   <!-- B21G, EU45, 21.570 GWD/MTU -->
   <material id="6">
     <density value="0.0690055" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="6.4862e-06" />
-    <nuclide name="U-235"  ao="5.6758e-04" />
-    <nuclide name="U-236"  ao="9.4556e-05" />
-    <nuclide name="U-238"  ao="2.1732e-02" />
-    <nuclide name="Pu-238" ao="1.1322e-06" />
-    <nuclide name="Pu-239" ao="1.2591e-04" />
-    <nuclide name="Pu-240" ao="2.6395e-05" />
-    <nuclide name="Pu-241" ao="1.3614e-05" />
-    <nuclide name="Pu-242" ao="2.2623e-06" />
-    <nuclide name="Am-241" ao="4.0266e-06" />
-    <nuclide name="Am-243" ao="2.6222e-07" />
-    <nuclide name="Np-237" ao="6.8089e-06" />
-    <nuclide name="Mo-95"  ao="3.1530e-05" />
-    <nuclide name="Tc-99"  ao="3.0319e-05" />
-    <nuclide name="Ru-101" ao="2.7452e-05" />
-    <nuclide name="Rh-103" ao="1.7260e-05" />
-    <nuclide name="Ag-109" ao="1.8879e-06" />
-    <nuclide name="Cs-133" ao="3.3140e-05" />
-    <nuclide name="Sm-147" ao="6.4488e-06" />
-    <nuclide name="Sm-149" ao="1.9390e-07" />
-    <nuclide name="Sm-150" ao="7.1174e-06" />
-    <nuclide name="Sm-151" ao="5.7531e-07" />
-    <nuclide name="Sm-152" ao="3.0178e-06" />
-    <nuclide name="Nd-143" ao="2.5793e-05" />
-    <nuclide name="Nd-145" ao="1.8633e-05" />
-    <nuclide name="Eu-153" ao="2.0026e-06" />
-    <nuclide name="Gd-155" ao="1.1986e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="6.4862e-06" />
+    <nuclide name="U235"  ao="5.6758e-04" />
+    <nuclide name="U236"  ao="9.4556e-05" />
+    <nuclide name="U238"  ao="2.1732e-02" />
+    <nuclide name="Pu238" ao="1.1322e-06" />
+    <nuclide name="Pu239" ao="1.2591e-04" />
+    <nuclide name="Pu240" ao="2.6395e-05" />
+    <nuclide name="Pu241" ao="1.3614e-05" />
+    <nuclide name="Pu242" ao="2.2623e-06" />
+    <nuclide name="Am241" ao="4.0266e-06" />
+    <nuclide name="Am243" ao="2.6222e-07" />
+    <nuclide name="Np237" ao="6.8089e-06" />
+    <nuclide name="Mo95"  ao="3.1530e-05" />
+    <nuclide name="Tc99"  ao="3.0319e-05" />
+    <nuclide name="Ru101" ao="2.7452e-05" />
+    <nuclide name="Rh103" ao="1.7260e-05" />
+    <nuclide name="Ag109" ao="1.8879e-06" />
+    <nuclide name="Cs133" ao="3.3140e-05" />
+    <nuclide name="Sm147" ao="6.4488e-06" />
+    <nuclide name="Sm149" ao="1.9390e-07" />
+    <nuclide name="Sm150" ao="7.1174e-06" />
+    <nuclide name="Sm151" ao="5.7531e-07" />
+    <nuclide name="Sm152" ao="3.0178e-06" />
+    <nuclide name="Nd143" ao="2.5793e-05" />
+    <nuclide name="Nd145" ao="1.8633e-05" />
+    <nuclide name="Eu153" ao="2.0026e-06" />
+    <nuclide name="Gd155" ao="1.1986e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B24G, EU45, 24.023 GWD/MTU -->
   <material id="7">
     <density value="0.0689673" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="6.2881e-06" />
-    <nuclide name="U-235"  ao="5.2562e-04" />
-    <nuclide name="U-236"  ao="1.0155e-04" />
-    <nuclide name="U-238"  ao="2.1693e-02" />
-    <nuclide name="Pu-238" ao="1.4876e-06" />
-    <nuclide name="Pu-239" ao="1.3161e-04" />
-    <nuclide name="Pu-240" ao="2.9965e-05" />
-    <nuclide name="Pu-241" ao="1.5953e-05" />
-    <nuclide name="Pu-242" ao="3.0335e-06" />
-    <nuclide name="Am-241" ao="4.7603e-06" />
-    <nuclide name="Am-243" ao="3.9809e-07" />
-    <nuclide name="Np-237" ao="7.9041e-06" />
-    <nuclide name="Mo-95"  ao="3.4781e-05" />
-    <nuclide name="Tc-99"  ao="3.3465e-05" />
-    <nuclide name="Ru-101" ao="3.0548e-05" />
-    <nuclide name="Rh-103" ao="1.9008e-05" />
-    <nuclide name="Ag-109" ao="2.2230e-06" />
-    <nuclide name="Cs-133" ao="3.6549e-05" />
-    <nuclide name="Sm-147" ao="6.9339e-06" />
-    <nuclide name="Sm-149" ao="1.9611e-07" />
-    <nuclide name="Sm-150" ao="8.0472e-06" />
-    <nuclide name="Sm-151" ao="6.0064e-07" />
-    <nuclide name="Sm-152" ao="3.3473e-06" />
-    <nuclide name="Nd-143" ao="2.8067e-05" />
-    <nuclide name="Nd-145" ao="2.0504e-05" />
-    <nuclide name="Eu-153" ao="2.3329e-06" />
-    <nuclide name="Gd-155" ao="1.4386e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="6.2881e-06" />
+    <nuclide name="U235"  ao="5.2562e-04" />
+    <nuclide name="U236"  ao="1.0155e-04" />
+    <nuclide name="U238"  ao="2.1693e-02" />
+    <nuclide name="Pu238" ao="1.4876e-06" />
+    <nuclide name="Pu239" ao="1.3161e-04" />
+    <nuclide name="Pu240" ao="2.9965e-05" />
+    <nuclide name="Pu241" ao="1.5953e-05" />
+    <nuclide name="Pu242" ao="3.0335e-06" />
+    <nuclide name="Am241" ao="4.7603e-06" />
+    <nuclide name="Am243" ao="3.9809e-07" />
+    <nuclide name="Np237" ao="7.9041e-06" />
+    <nuclide name="Mo95"  ao="3.4781e-05" />
+    <nuclide name="Tc99"  ao="3.3465e-05" />
+    <nuclide name="Ru101" ao="3.0548e-05" />
+    <nuclide name="Rh103" ao="1.9008e-05" />
+    <nuclide name="Ag109" ao="2.2230e-06" />
+    <nuclide name="Cs133" ao="3.6549e-05" />
+    <nuclide name="Sm147" ao="6.9339e-06" />
+    <nuclide name="Sm149" ao="1.9611e-07" />
+    <nuclide name="Sm150" ao="8.0472e-06" />
+    <nuclide name="Sm151" ao="6.0064e-07" />
+    <nuclide name="Sm152" ao="3.3473e-06" />
+    <nuclide name="Nd143" ao="2.8067e-05" />
+    <nuclide name="Nd145" ao="2.0504e-05" />
+    <nuclide name="Eu153" ao="2.3329e-06" />
+    <nuclide name="Gd155" ao="1.4386e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B30G, EU45, 30.580 GWD/MTU -->
   <material id="8">
     <density value="0.0688634" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="5.7868e-06" />
-    <nuclide name="U-235"  ao="4.2455e-04" />
-    <nuclide name="U-236"  ao="1.1763e-04" />
-    <nuclide name="U-238"  ao="2.1585e-02" />
-    <nuclide name="Pu-238" ao="2.7262e-06" />
-    <nuclide name="Pu-239" ao="1.4249e-04" />
-    <nuclide name="Pu-240" ao="3.9140e-05" />
-    <nuclide name="Pu-241" ao="2.1863e-05" />
-    <nuclide name="Pu-242" ao="5.6472e-06" />
-    <nuclide name="Am-241" ao="6.6579e-06" />
-    <nuclide name="Am-243" ao="9.7353e-07" />
-    <nuclide name="Np-237" ao="1.0948e-05" />
-    <nuclide name="Mo-95"  ao="4.3130e-05" />
-    <nuclide name="Tc-99"  ao="4.1531e-05" />
-    <nuclide name="Ru-101" ao="3.8751e-05" />
-    <nuclide name="Rh-103" ao="2.3371e-05" />
-    <nuclide name="Ag-109" ao="3.1774e-06" />
-    <nuclide name="Cs-133" ao="4.5257e-05" />
-    <nuclide name="Sm-147" ao="8.0315e-06" />
-    <nuclide name="Sm-149" ao="1.9935e-07" />
-    <nuclide name="Sm-150" ao="1.0496e-05" />
-    <nuclide name="Sm-151" ao="6.6160e-07" />
-    <nuclide name="Sm-152" ao="4.1844e-06" />
-    <nuclide name="Nd-143" ao="3.3502e-05" />
-    <nuclide name="Nd-145" ao="2.5263e-05" />
-    <nuclide name="Eu-153" ao="3.2546e-06" />
-    <nuclide name="Gd-155" ao="2.2155e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="5.7868e-06" />
+    <nuclide name="U235"  ao="4.2455e-04" />
+    <nuclide name="U236"  ao="1.1763e-04" />
+    <nuclide name="U238"  ao="2.1585e-02" />
+    <nuclide name="Pu238" ao="2.7262e-06" />
+    <nuclide name="Pu239" ao="1.4249e-04" />
+    <nuclide name="Pu240" ao="3.9140e-05" />
+    <nuclide name="Pu241" ao="2.1863e-05" />
+    <nuclide name="Pu242" ao="5.6472e-06" />
+    <nuclide name="Am241" ao="6.6579e-06" />
+    <nuclide name="Am243" ao="9.7353e-07" />
+    <nuclide name="Np237" ao="1.0948e-05" />
+    <nuclide name="Mo95"  ao="4.3130e-05" />
+    <nuclide name="Tc99"  ao="4.1531e-05" />
+    <nuclide name="Ru101" ao="3.8751e-05" />
+    <nuclide name="Rh103" ao="2.3371e-05" />
+    <nuclide name="Ag109" ao="3.1774e-06" />
+    <nuclide name="Cs133" ao="4.5257e-05" />
+    <nuclide name="Sm147" ao="8.0315e-06" />
+    <nuclide name="Sm149" ao="1.9935e-07" />
+    <nuclide name="Sm150" ao="1.0496e-05" />
+    <nuclide name="Sm151" ao="6.6160e-07" />
+    <nuclide name="Sm152" ao="4.1844e-06" />
+    <nuclide name="Nd143" ao="3.3502e-05" />
+    <nuclide name="Nd145" ao="2.5263e-05" />
+    <nuclide name="Eu153" ao="3.2546e-06" />
+    <nuclide name="Gd155" ao="2.2155e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B40G, EU45, 40.424 GWD/MTU -->
   <material id="9">
     <density value="0.0687030" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="5.1152e-06" />
-    <nuclide name="U-235"  ao="3.0002e-04" />
-    <nuclide name="U-236"  ao="1.3534e-04" />
-    <nuclide name="U-238"  ao="2.1413e-02" />
-    <nuclide name="Pu-238" ao="5.3656e-06" />
-    <nuclide name="Pu-239" ao="1.5064e-04" />
-    <nuclide name="Pu-240" ao="5.1484e-05" />
-    <nuclide name="Pu-241" ao="2.9175e-05" />
-    <nuclide name="Pu-242" ao="1.0893e-05" />
-    <nuclide name="Am-241" ao="9.0866e-06" />
-    <nuclide name="Am-243" ao="2.5108e-06" />
-    <nuclide name="Np-237" ao="1.5602e-05" />
-    <nuclide name="Mo-95"  ao="5.4806e-05" />
-    <nuclide name="Tc-99"  ao="5.2746e-05" />
-    <nuclide name="Ru-101" ao="5.0881e-05" />
-    <nuclide name="Rh-103" ao="2.9057e-05" />
-    <nuclide name="Ag-109" ao="4.7134e-06" />
-    <nuclide name="Cs-133" ao="5.7263e-05" />
-    <nuclide name="Sm-147" ao="9.2075e-06" />
-    <nuclide name="Sm-149" ao="1.9993e-07" />
-    <nuclide name="Sm-150" ao="1.3997e-05" />
-    <nuclide name="Sm-151" ao="7.3765e-07" />
-    <nuclide name="Sm-152" ao="5.3316e-06" />
-    <nuclide name="Nd-143" ao="3.9984e-05" />
-    <nuclide name="Nd-145" ao="3.1783e-05" />
-    <nuclide name="Eu-153" ao="4.6705e-06" />
-    <nuclide name="Gd-155" ao="3.6871e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="5.1152e-06" />
+    <nuclide name="U235"  ao="3.0002e-04" />
+    <nuclide name="U236"  ao="1.3534e-04" />
+    <nuclide name="U238"  ao="2.1413e-02" />
+    <nuclide name="Pu238" ao="5.3656e-06" />
+    <nuclide name="Pu239" ao="1.5064e-04" />
+    <nuclide name="Pu240" ao="5.1484e-05" />
+    <nuclide name="Pu241" ao="2.9175e-05" />
+    <nuclide name="Pu242" ao="1.0893e-05" />
+    <nuclide name="Am241" ao="9.0866e-06" />
+    <nuclide name="Am243" ao="2.5108e-06" />
+    <nuclide name="Np237" ao="1.5602e-05" />
+    <nuclide name="Mo95"  ao="5.4806e-05" />
+    <nuclide name="Tc99"  ao="5.2746e-05" />
+    <nuclide name="Ru101" ao="5.0881e-05" />
+    <nuclide name="Rh103" ao="2.9057e-05" />
+    <nuclide name="Ag109" ao="4.7134e-06" />
+    <nuclide name="Cs133" ao="5.7263e-05" />
+    <nuclide name="Sm147" ao="9.2075e-06" />
+    <nuclide name="Sm149" ao="1.9993e-07" />
+    <nuclide name="Sm150" ao="1.3997e-05" />
+    <nuclide name="Sm151" ao="7.3765e-07" />
+    <nuclide name="Sm152" ao="5.3316e-06" />
+    <nuclide name="Nd143" ao="3.9984e-05" />
+    <nuclide name="Nd145" ao="3.1783e-05" />
+    <nuclide name="Eu153" ao="4.6705e-06" />
+    <nuclide name="Gd155" ao="3.6871e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B40G, EU55, 54.605 GWD/MTU -->
   <material id="10">
     <density value="0.06845907" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="4.3280e-06" />
-    <nuclide name="U-235"  ao="1.7108e-04" />
-    <nuclide name="U-236"  ao="1.4897e-04" />
-    <nuclide name="U-238"  ao="2.1142e-02" />
-    <nuclide name="Pu-238" ao="1.0471e-05" />
-    <nuclide name="Pu-239" ao="1.5300e-04" />
-    <nuclide name="Pu-240" ao="6.5540e-05" />
-    <nuclide name="Pu-241" ao="3.6032e-05" />
-    <nuclide name="Pu-242" ao="2.0303e-05" />
-    <nuclide name="Am-241" ao="1.1405e-05" />
-    <nuclide name="Am-243" ao="6.1550e-06" />
-    <nuclide name="Np-237" ao="2.1806e-05" />
-    <nuclide name="Mo-95"  ao="6.9892e-05" />
-    <nuclide name="Tc-99"  ao="6.6975e-05" />
-    <nuclide name="Ru-101" ao="6.7875e-05" />
-    <nuclide name="Rh-103" ao="3.5406e-05" />
-    <nuclide name="Ag-109" ao="6.9836e-06" />
-    <nuclide name="Cs-133" ao="7.2263e-05" />
-    <nuclide name="Sm-147" ao="1.0106e-05" />
-    <nuclide name="Sm-149" ao="1.9259e-07" />
-    <nuclide name="Sm-150" ao="1.8627e-05" />
-    <nuclide name="Sm-151" ao="8.1779e-07" />
-    <nuclide name="Sm-152" ao="6.7637e-06" />
-    <nuclide name="Nd-143" ao="4.5992e-05" />
-    <nuclide name="Nd-145" ao="3.9892e-05" />
-    <nuclide name="Eu-153" ao="6.5858e-06" />
-    <nuclide name="Gd-155" ao="6.0862e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="4.3280e-06" />
+    <nuclide name="U235"  ao="1.7108e-04" />
+    <nuclide name="U236"  ao="1.4897e-04" />
+    <nuclide name="U238"  ao="2.1142e-02" />
+    <nuclide name="Pu238" ao="1.0471e-05" />
+    <nuclide name="Pu239" ao="1.5300e-04" />
+    <nuclide name="Pu240" ao="6.5540e-05" />
+    <nuclide name="Pu241" ao="3.6032e-05" />
+    <nuclide name="Pu242" ao="2.0303e-05" />
+    <nuclide name="Am241" ao="1.1405e-05" />
+    <nuclide name="Am243" ao="6.1550e-06" />
+    <nuclide name="Np237" ao="2.1806e-05" />
+    <nuclide name="Mo95"  ao="6.9892e-05" />
+    <nuclide name="Tc99"  ao="6.6975e-05" />
+    <nuclide name="Ru101" ao="6.7875e-05" />
+    <nuclide name="Rh103" ao="3.5406e-05" />
+    <nuclide name="Ag109" ao="6.9836e-06" />
+    <nuclide name="Cs133" ao="7.2263e-05" />
+    <nuclide name="Sm147" ao="1.0106e-05" />
+    <nuclide name="Sm149" ao="1.9259e-07" />
+    <nuclide name="Sm150" ao="1.8627e-05" />
+    <nuclide name="Sm151" ao="8.1779e-07" />
+    <nuclide name="Sm152" ao="6.7637e-06" />
+    <nuclide name="Nd143" ao="4.5992e-05" />
+    <nuclide name="Nd145" ao="3.9892e-05" />
+    <nuclide name="Eu153" ao="6.5858e-06" />
+    <nuclide name="Gd155" ao="6.0862e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
 </materials>
diff --git a/source-convergence/benchmark-2/openmc/case2_3/materials.xml b/source-convergence/benchmark-2/openmc/case2_3/materials.xml
index fcd752d..0d01152 100644
--- a/source-convergence/benchmark-2/openmc/case2_3/materials.xml
+++ b/source-convergence/benchmark-2/openmc/case2_3/materials.xml
@@ -17,27 +17,27 @@
   <!-- Water, 25 deg.C -->
   <material id="1">
     <density value="0.099987" units="atom/b-cm" />
-    <nuclide name="H-1"  ao="6.6658e-02" />
-    <nuclide name="O-16" ao="3.3329e-02" />
-    <sab name="HH2O" xs="71t" />
+    <nuclide name="H1"  ao="6.6658e-02" />
+    <nuclide name="O16" ao="3.3329e-02" />
+    <sab name="c_H_in_H2O" />
   </material>
 
   <!-- Zircaloy-4 -->
   <material id="2">
     <density value="0.043206271" units="atom/b-cm" />
-    <nuclide name="Cr-50" ao="3.2975e-06" />
-    <nuclide name="Cr-52" ao="6.3588e-05" />
-    <nuclide name="Cr-53" ao="7.2104e-06" />
-    <nuclide name="Cr-54" ao="1.7948e-06" />
-    <nuclide name="Fe-54" ao="8.6728e-06" />
-    <nuclide name="Fe-56" ao="1.3614e-04" />
-    <nuclide name="Fe-57" ao="3.1442e-06" />
-    <nuclide name="Fe-58" ao="4.1843e-07" />
-    <nuclide name="Zr-90" ao="2.2114e-02" />
-    <nuclide name="Zr-91" ao="4.8226e-03" />
-    <nuclide name="Zr-92" ao="7.3714e-03" />
-    <nuclide name="Zr-94" ao="7.4703e-03" />
-    <nuclide name="Zr-96" ao="1.2035e-03" />
+    <nuclide name="Cr50" ao="3.2975e-06" />
+    <nuclide name="Cr52" ao="6.3588e-05" />
+    <nuclide name="Cr53" ao="7.2104e-06" />
+    <nuclide name="Cr54" ao="1.7948e-06" />
+    <nuclide name="Fe54" ao="8.6728e-06" />
+    <nuclide name="Fe56" ao="1.3614e-04" />
+    <nuclide name="Fe57" ao="3.1442e-06" />
+    <nuclide name="Fe58" ao="4.1843e-07" />
+    <nuclide name="Zr90" ao="2.2114e-02" />
+    <nuclide name="Zr91" ao="4.8226e-03" />
+    <nuclide name="Zr92" ao="7.3714e-03" />
+    <nuclide name="Zr94" ao="7.4703e-03" />
+    <nuclide name="Zr96" ao="1.2035e-03" />
   </material>
 
   <!-- ====================== Fresh fuels =========================== -->
@@ -45,29 +45,29 @@
   <!-- EU45: UO2, 4.5wt% enriched -->
   <material id="3">
     <density value="0.0693284852" units="atom/b-cm" />
-    <nuclide name="U-234" ao="8.4100e-06" />
-    <nuclide name="U-235" ao="1.0526e-03" />
-    <nuclide name="U-236" ao="6.4752e-06" />
-    <nuclide name="U-238" ao="2.2042e-02" />
-    <nuclide name="O-16"  ao="4.6219e-02" />
+    <nuclide name="U234" ao="8.4100e-06" />
+    <nuclide name="U235" ao="1.0526e-03" />
+    <nuclide name="U236" ao="6.4752e-06" />
+    <nuclide name="U238" ao="2.2042e-02" />
+    <nuclide name="O16"  ao="4.6219e-02" />
   </material>
 
   <!-- EU40: UO2, 4.0wt% enriched -->
   <material id="4">
     <density value="0.0696080381" units="atom/b-cm" />
-    <nuclide name="U-234" ao="7.5481e-06" />
-    <nuclide name="U-235" ao="9.3949e-04" />
-    <nuclide name="U-238" ao="2.2256e-02" />
-    <nuclide name="O-16"  ao="4.6405e-02" />
+    <nuclide name="U234" ao="7.5481e-06" />
+    <nuclide name="U235" ao="9.3949e-04" />
+    <nuclide name="U238" ao="2.2256e-02" />
+    <nuclide name="O16"  ao="4.6405e-02" />
   </material>
 
   <!-- NU: UO2, Natural uranium   -->
   <material id="5">
     <density value="0.0695822757" units="atom/b-cm" />
-    <nuclide name="U-234" ao="1.2757e-06" />
-    <nuclide name="U-235" ao="1.6700e-04" />
-    <nuclide name="U-238" ao="2.3026e-02" />
-    <nuclide name="O-16"  ao="4.6388e-02" />
+    <nuclide name="U234" ao="1.2757e-06" />
+    <nuclide name="U235" ao="1.6700e-04" />
+    <nuclide name="U238" ao="2.3026e-02" />
+    <nuclide name="O16"  ao="4.6388e-02" />
   </material>
 
   <!-- ===================== Burnup fuels =========================== -->
@@ -75,166 +75,166 @@
   <!-- B21G, EU45, 21.570 GWD/MTU -->
   <material id="6">
     <density value="0.0690055" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="6.4862e-06" />
-    <nuclide name="U-235"  ao="5.6758e-04" />
-    <nuclide name="U-236"  ao="9.4556e-05" />
-    <nuclide name="U-238"  ao="2.1732e-02" />
-    <nuclide name="Pu-238" ao="1.1322e-06" />
-    <nuclide name="Pu-239" ao="1.2591e-04" />
-    <nuclide name="Pu-240" ao="2.6395e-05" />
-    <nuclide name="Pu-241" ao="1.3614e-05" />
-    <nuclide name="Pu-242" ao="2.2623e-06" />
-    <nuclide name="Am-241" ao="4.0266e-06" />
-    <nuclide name="Am-243" ao="2.6222e-07" />
-    <nuclide name="Np-237" ao="6.8089e-06" />
-    <nuclide name="Mo-95"  ao="3.1530e-05" />
-    <nuclide name="Tc-99"  ao="3.0319e-05" />
-    <nuclide name="Ru-101" ao="2.7452e-05" />
-    <nuclide name="Rh-103" ao="1.7260e-05" />
-    <nuclide name="Ag-109" ao="1.8879e-06" />
-    <nuclide name="Cs-133" ao="3.3140e-05" />
-    <nuclide name="Sm-147" ao="6.4488e-06" />
-    <nuclide name="Sm-149" ao="1.9390e-07" />
-    <nuclide name="Sm-150" ao="7.1174e-06" />
-    <nuclide name="Sm-151" ao="5.7531e-07" />
-    <nuclide name="Sm-152" ao="3.0178e-06" />
-    <nuclide name="Nd-143" ao="2.5793e-05" />
-    <nuclide name="Nd-145" ao="1.8633e-05" />
-    <nuclide name="Eu-153" ao="2.0026e-06" />
-    <nuclide name="Gd-155" ao="1.1986e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="6.4862e-06" />
+    <nuclide name="U235"  ao="5.6758e-04" />
+    <nuclide name="U236"  ao="9.4556e-05" />
+    <nuclide name="U238"  ao="2.1732e-02" />
+    <nuclide name="Pu238" ao="1.1322e-06" />
+    <nuclide name="Pu239" ao="1.2591e-04" />
+    <nuclide name="Pu240" ao="2.6395e-05" />
+    <nuclide name="Pu241" ao="1.3614e-05" />
+    <nuclide name="Pu242" ao="2.2623e-06" />
+    <nuclide name="Am241" ao="4.0266e-06" />
+    <nuclide name="Am243" ao="2.6222e-07" />
+    <nuclide name="Np237" ao="6.8089e-06" />
+    <nuclide name="Mo95"  ao="3.1530e-05" />
+    <nuclide name="Tc99"  ao="3.0319e-05" />
+    <nuclide name="Ru101" ao="2.7452e-05" />
+    <nuclide name="Rh103" ao="1.7260e-05" />
+    <nuclide name="Ag109" ao="1.8879e-06" />
+    <nuclide name="Cs133" ao="3.3140e-05" />
+    <nuclide name="Sm147" ao="6.4488e-06" />
+    <nuclide name="Sm149" ao="1.9390e-07" />
+    <nuclide name="Sm150" ao="7.1174e-06" />
+    <nuclide name="Sm151" ao="5.7531e-07" />
+    <nuclide name="Sm152" ao="3.0178e-06" />
+    <nuclide name="Nd143" ao="2.5793e-05" />
+    <nuclide name="Nd145" ao="1.8633e-05" />
+    <nuclide name="Eu153" ao="2.0026e-06" />
+    <nuclide name="Gd155" ao="1.1986e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B24G, EU45, 24.023 GWD/MTU -->
   <material id="7">
     <density value="0.0689673" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="6.2881e-06" />
-    <nuclide name="U-235"  ao="5.2562e-04" />
-    <nuclide name="U-236"  ao="1.0155e-04" />
-    <nuclide name="U-238"  ao="2.1693e-02" />
-    <nuclide name="Pu-238" ao="1.4876e-06" />
-    <nuclide name="Pu-239" ao="1.3161e-04" />
-    <nuclide name="Pu-240" ao="2.9965e-05" />
-    <nuclide name="Pu-241" ao="1.5953e-05" />
-    <nuclide name="Pu-242" ao="3.0335e-06" />
-    <nuclide name="Am-241" ao="4.7603e-06" />
-    <nuclide name="Am-243" ao="3.9809e-07" />
-    <nuclide name="Np-237" ao="7.9041e-06" />
-    <nuclide name="Mo-95"  ao="3.4781e-05" />
-    <nuclide name="Tc-99"  ao="3.3465e-05" />
-    <nuclide name="Ru-101" ao="3.0548e-05" />
-    <nuclide name="Rh-103" ao="1.9008e-05" />
-    <nuclide name="Ag-109" ao="2.2230e-06" />
-    <nuclide name="Cs-133" ao="3.6549e-05" />
-    <nuclide name="Sm-147" ao="6.9339e-06" />
-    <nuclide name="Sm-149" ao="1.9611e-07" />
-    <nuclide name="Sm-150" ao="8.0472e-06" />
-    <nuclide name="Sm-151" ao="6.0064e-07" />
-    <nuclide name="Sm-152" ao="3.3473e-06" />
-    <nuclide name="Nd-143" ao="2.8067e-05" />
-    <nuclide name="Nd-145" ao="2.0504e-05" />
-    <nuclide name="Eu-153" ao="2.3329e-06" />
-    <nuclide name="Gd-155" ao="1.4386e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="6.2881e-06" />
+    <nuclide name="U235"  ao="5.2562e-04" />
+    <nuclide name="U236"  ao="1.0155e-04" />
+    <nuclide name="U238"  ao="2.1693e-02" />
+    <nuclide name="Pu238" ao="1.4876e-06" />
+    <nuclide name="Pu239" ao="1.3161e-04" />
+    <nuclide name="Pu240" ao="2.9965e-05" />
+    <nuclide name="Pu241" ao="1.5953e-05" />
+    <nuclide name="Pu242" ao="3.0335e-06" />
+    <nuclide name="Am241" ao="4.7603e-06" />
+    <nuclide name="Am243" ao="3.9809e-07" />
+    <nuclide name="Np237" ao="7.9041e-06" />
+    <nuclide name="Mo95"  ao="3.4781e-05" />
+    <nuclide name="Tc99"  ao="3.3465e-05" />
+    <nuclide name="Ru101" ao="3.0548e-05" />
+    <nuclide name="Rh103" ao="1.9008e-05" />
+    <nuclide name="Ag109" ao="2.2230e-06" />
+    <nuclide name="Cs133" ao="3.6549e-05" />
+    <nuclide name="Sm147" ao="6.9339e-06" />
+    <nuclide name="Sm149" ao="1.9611e-07" />
+    <nuclide name="Sm150" ao="8.0472e-06" />
+    <nuclide name="Sm151" ao="6.0064e-07" />
+    <nuclide name="Sm152" ao="3.3473e-06" />
+    <nuclide name="Nd143" ao="2.8067e-05" />
+    <nuclide name="Nd145" ao="2.0504e-05" />
+    <nuclide name="Eu153" ao="2.3329e-06" />
+    <nuclide name="Gd155" ao="1.4386e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B30G, EU45, 30.580 GWD/MTU -->
   <material id="8">
     <density value="0.0688634" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="5.7868e-06" />
-    <nuclide name="U-235"  ao="4.2455e-04" />
-    <nuclide name="U-236"  ao="1.1763e-04" />
-    <nuclide name="U-238"  ao="2.1585e-02" />
-    <nuclide name="Pu-238" ao="2.7262e-06" />
-    <nuclide name="Pu-239" ao="1.4249e-04" />
-    <nuclide name="Pu-240" ao="3.9140e-05" />
-    <nuclide name="Pu-241" ao="2.1863e-05" />
-    <nuclide name="Pu-242" ao="5.6472e-06" />
-    <nuclide name="Am-241" ao="6.6579e-06" />
-    <nuclide name="Am-243" ao="9.7353e-07" />
-    <nuclide name="Np-237" ao="1.0948e-05" />
-    <nuclide name="Mo-95"  ao="4.3130e-05" />
-    <nuclide name="Tc-99"  ao="4.1531e-05" />
-    <nuclide name="Ru-101" ao="3.8751e-05" />
-    <nuclide name="Rh-103" ao="2.3371e-05" />
-    <nuclide name="Ag-109" ao="3.1774e-06" />
-    <nuclide name="Cs-133" ao="4.5257e-05" />
-    <nuclide name="Sm-147" ao="8.0315e-06" />
-    <nuclide name="Sm-149" ao="1.9935e-07" />
-    <nuclide name="Sm-150" ao="1.0496e-05" />
-    <nuclide name="Sm-151" ao="6.6160e-07" />
-    <nuclide name="Sm-152" ao="4.1844e-06" />
-    <nuclide name="Nd-143" ao="3.3502e-05" />
-    <nuclide name="Nd-145" ao="2.5263e-05" />
-    <nuclide name="Eu-153" ao="3.2546e-06" />
-    <nuclide name="Gd-155" ao="2.2155e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="5.7868e-06" />
+    <nuclide name="U235"  ao="4.2455e-04" />
+    <nuclide name="U236"  ao="1.1763e-04" />
+    <nuclide name="U238"  ao="2.1585e-02" />
+    <nuclide name="Pu238" ao="2.7262e-06" />
+    <nuclide name="Pu239" ao="1.4249e-04" />
+    <nuclide name="Pu240" ao="3.9140e-05" />
+    <nuclide name="Pu241" ao="2.1863e-05" />
+    <nuclide name="Pu242" ao="5.6472e-06" />
+    <nuclide name="Am241" ao="6.6579e-06" />
+    <nuclide name="Am243" ao="9.7353e-07" />
+    <nuclide name="Np237" ao="1.0948e-05" />
+    <nuclide name="Mo95"  ao="4.3130e-05" />
+    <nuclide name="Tc99"  ao="4.1531e-05" />
+    <nuclide name="Ru101" ao="3.8751e-05" />
+    <nuclide name="Rh103" ao="2.3371e-05" />
+    <nuclide name="Ag109" ao="3.1774e-06" />
+    <nuclide name="Cs133" ao="4.5257e-05" />
+    <nuclide name="Sm147" ao="8.0315e-06" />
+    <nuclide name="Sm149" ao="1.9935e-07" />
+    <nuclide name="Sm150" ao="1.0496e-05" />
+    <nuclide name="Sm151" ao="6.6160e-07" />
+    <nuclide name="Sm152" ao="4.1844e-06" />
+    <nuclide name="Nd143" ao="3.3502e-05" />
+    <nuclide name="Nd145" ao="2.5263e-05" />
+    <nuclide name="Eu153" ao="3.2546e-06" />
+    <nuclide name="Gd155" ao="2.2155e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B40G, EU45, 40.424 GWD/MTU -->
   <material id="9">
     <density value="0.0687030" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="5.1152e-06" />
-    <nuclide name="U-235"  ao="3.0002e-04" />
-    <nuclide name="U-236"  ao="1.3534e-04" />
-    <nuclide name="U-238"  ao="2.1413e-02" />
-    <nuclide name="Pu-238" ao="5.3656e-06" />
-    <nuclide name="Pu-239" ao="1.5064e-04" />
-    <nuclide name="Pu-240" ao="5.1484e-05" />
-    <nuclide name="Pu-241" ao="2.9175e-05" />
-    <nuclide name="Pu-242" ao="1.0893e-05" />
-    <nuclide name="Am-241" ao="9.0866e-06" />
-    <nuclide name="Am-243" ao="2.5108e-06" />
-    <nuclide name="Np-237" ao="1.5602e-05" />
-    <nuclide name="Mo-95"  ao="5.4806e-05" />
-    <nuclide name="Tc-99"  ao="5.2746e-05" />
-    <nuclide name="Ru-101" ao="5.0881e-05" />
-    <nuclide name="Rh-103" ao="2.9057e-05" />
-    <nuclide name="Ag-109" ao="4.7134e-06" />
-    <nuclide name="Cs-133" ao="5.7263e-05" />
-    <nuclide name="Sm-147" ao="9.2075e-06" />
-    <nuclide name="Sm-149" ao="1.9993e-07" />
-    <nuclide name="Sm-150" ao="1.3997e-05" />
-    <nuclide name="Sm-151" ao="7.3765e-07" />
-    <nuclide name="Sm-152" ao="5.3316e-06" />
-    <nuclide name="Nd-143" ao="3.9984e-05" />
-    <nuclide name="Nd-145" ao="3.1783e-05" />
-    <nuclide name="Eu-153" ao="4.6705e-06" />
-    <nuclide name="Gd-155" ao="3.6871e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="5.1152e-06" />
+    <nuclide name="U235"  ao="3.0002e-04" />
+    <nuclide name="U236"  ao="1.3534e-04" />
+    <nuclide name="U238"  ao="2.1413e-02" />
+    <nuclide name="Pu238" ao="5.3656e-06" />
+    <nuclide name="Pu239" ao="1.5064e-04" />
+    <nuclide name="Pu240" ao="5.1484e-05" />
+    <nuclide name="Pu241" ao="2.9175e-05" />
+    <nuclide name="Pu242" ao="1.0893e-05" />
+    <nuclide name="Am241" ao="9.0866e-06" />
+    <nuclide name="Am243" ao="2.5108e-06" />
+    <nuclide name="Np237" ao="1.5602e-05" />
+    <nuclide name="Mo95"  ao="5.4806e-05" />
+    <nuclide name="Tc99"  ao="5.2746e-05" />
+    <nuclide name="Ru101" ao="5.0881e-05" />
+    <nuclide name="Rh103" ao="2.9057e-05" />
+    <nuclide name="Ag109" ao="4.7134e-06" />
+    <nuclide name="Cs133" ao="5.7263e-05" />
+    <nuclide name="Sm147" ao="9.2075e-06" />
+    <nuclide name="Sm149" ao="1.9993e-07" />
+    <nuclide name="Sm150" ao="1.3997e-05" />
+    <nuclide name="Sm151" ao="7.3765e-07" />
+    <nuclide name="Sm152" ao="5.3316e-06" />
+    <nuclide name="Nd143" ao="3.9984e-05" />
+    <nuclide name="Nd145" ao="3.1783e-05" />
+    <nuclide name="Eu153" ao="4.6705e-06" />
+    <nuclide name="Gd155" ao="3.6871e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
   <!-- B40G, EU55, 54.605 GWD/MTU -->
   <material id="10">
     <density value="0.06845907" units="atom/b-cm" />
-    <nuclide name="U-234"  ao="4.3280e-06" />
-    <nuclide name="U-235"  ao="1.7108e-04" />
-    <nuclide name="U-236"  ao="1.4897e-04" />
-    <nuclide name="U-238"  ao="2.1142e-02" />
-    <nuclide name="Pu-238" ao="1.0471e-05" />
-    <nuclide name="Pu-239" ao="1.5300e-04" />
-    <nuclide name="Pu-240" ao="6.5540e-05" />
-    <nuclide name="Pu-241" ao="3.6032e-05" />
-    <nuclide name="Pu-242" ao="2.0303e-05" />
-    <nuclide name="Am-241" ao="1.1405e-05" />
-    <nuclide name="Am-243" ao="6.1550e-06" />
-    <nuclide name="Np-237" ao="2.1806e-05" />
-    <nuclide name="Mo-95"  ao="6.9892e-05" />
-    <nuclide name="Tc-99"  ao="6.6975e-05" />
-    <nuclide name="Ru-101" ao="6.7875e-05" />
-    <nuclide name="Rh-103" ao="3.5406e-05" />
-    <nuclide name="Ag-109" ao="6.9836e-06" />
-    <nuclide name="Cs-133" ao="7.2263e-05" />
-    <nuclide name="Sm-147" ao="1.0106e-05" />
-    <nuclide name="Sm-149" ao="1.9259e-07" />
-    <nuclide name="Sm-150" ao="1.8627e-05" />
-    <nuclide name="Sm-151" ao="8.1779e-07" />
-    <nuclide name="Sm-152" ao="6.7637e-06" />
-    <nuclide name="Nd-143" ao="4.5992e-05" />
-    <nuclide name="Nd-145" ao="3.9892e-05" />
-    <nuclide name="Eu-153" ao="6.5858e-06" />
-    <nuclide name="Gd-155" ao="6.0862e-07" />
-    <nuclide name="O-16"   ao="4.6219e-02" />
+    <nuclide name="U234"  ao="4.3280e-06" />
+    <nuclide name="U235"  ao="1.7108e-04" />
+    <nuclide name="U236"  ao="1.4897e-04" />
+    <nuclide name="U238"  ao="2.1142e-02" />
+    <nuclide name="Pu238" ao="1.0471e-05" />
+    <nuclide name="Pu239" ao="1.5300e-04" />
+    <nuclide name="Pu240" ao="6.5540e-05" />
+    <nuclide name="Pu241" ao="3.6032e-05" />
+    <nuclide name="Pu242" ao="2.0303e-05" />
+    <nuclide name="Am241" ao="1.1405e-05" />
+    <nuclide name="Am243" ao="6.1550e-06" />
+    <nuclide name="Np237" ao="2.1806e-05" />
+    <nuclide name="Mo95"  ao="6.9892e-05" />
+    <nuclide name="Tc99"  ao="6.6975e-05" />
+    <nuclide name="Ru101" ao="6.7875e-05" />
+    <nuclide name="Rh103" ao="3.5406e-05" />
+    <nuclide name="Ag109" ao="6.9836e-06" />
+    <nuclide name="Cs133" ao="7.2263e-05" />
+    <nuclide name="Sm147" ao="1.0106e-05" />
+    <nuclide name="Sm149" ao="1.9259e-07" />
+    <nuclide name="Sm150" ao="1.8627e-05" />
+    <nuclide name="Sm151" ao="8.1779e-07" />
+    <nuclide name="Sm152" ao="6.7637e-06" />
+    <nuclide name="Nd143" ao="4.5992e-05" />
+    <nuclide name="Nd145" ao="3.9892e-05" />
+    <nuclide name="Eu153" ao="6.5858e-06" />
+    <nuclide name="Gd155" ao="6.0862e-07" />
+    <nuclide name="O16"   ao="4.6219e-02" />
   </material>
 
 </materials>