diff --git a/docs/source/pythonapi/examples.rst b/docs/source/pythonapi/examples.rst
index 2a3ebbd8e..e7ef523c0 100644
--- a/docs/source/pythonapi/examples.rst
+++ b/docs/source/pythonapi/examples.rst
@@ -20,6 +20,6 @@ Reactor Models
    :nosignatures:
    :template: myfunction.rst
 
+   openmc.examples.pwr_pin_cell
    openmc.examples.pwr_assembly
    openmc.examples.pwr_core
-   openmc.examples.pwr_pin_cell
diff --git a/openmc/examples.py b/openmc/examples.py
index 0e17747fc..4eeae7799 100644
--- a/openmc/examples.py
+++ b/openmc/examples.py
@@ -21,14 +21,14 @@ def pwr_pin_cell():
     model = openmc.model.Model()
 
     # Define materials.
-    fuel = openmc.Material(name='Fuel')
+    fuel = openmc.Material(name='UO2 (2.4%)')
     fuel.set_density('g/cm3', 10.29769)
     fuel.add_nuclide("U234", 4.4843e-6)
     fuel.add_nuclide("U235", 5.5815e-4)
     fuel.add_nuclide("U238", 2.2408e-2)
     fuel.add_nuclide("O16", 4.5829e-2)
 
-    clad = openmc.Material(name='Cladding')
+    clad = openmc.Material(name='Zircaloy')
     clad.set_density('g/cm3', 6.55)
     clad.add_nuclide("Zr90", 2.1827e-2)
     clad.add_nuclide("Zr91", 4.7600e-3)
@@ -58,9 +58,9 @@ def pwr_pin_cell():
     top = openmc.YPlane(y0=pitch/2, name='top', boundary_type='reflective')
 
     # Instantiate Cells
-    fuel_pin = openmc.Cell(name='cell 1', fill=fuel)
-    cladding = openmc.Cell(name='cell 3', fill=clad)
-    water = openmc.Cell(name='cell 2', fill=hot_water)
+    fuel_pin = openmc.Cell(name='Fuel', fill=fuel)
+    cladding = openmc.Cell(name='Cladding', fill=clad)
+    water = openmc.Cell(name='Water', fill=hot_water)
 
     # Use surface half-spaces to define regions
     fuel_pin.region = -fuel_or
@@ -102,7 +102,7 @@ def pwr_core():
     model = openmc.model.Model()
 
     # Define materials.
-    fuel = openmc.Material(name='Fuel', material_id=1)
+    fuel = openmc.Material(1, name='UOX fuel')
     fuel.set_density('g/cm3', 10.062)
     fuel.add_nuclide("U234", 4.9476e-6)
     fuel.add_nuclide("U235", 4.8218e-4)
@@ -110,7 +110,7 @@ def pwr_core():
     fuel.add_nuclide("Xe135", 1.0801e-8)
     fuel.add_nuclide("O16", 4.5737e-2)
 
-    clad = openmc.Material(name='Cladding', material_id=2)
+    clad = openmc.Material(2, name='Zircaloy')
     clad.set_density('g/cm3', 5.77)
     clad.add_nuclide("Zr90", 0.5145)
     clad.add_nuclide("Zr91", 0.1122)
@@ -118,7 +118,7 @@ def pwr_core():
     clad.add_nuclide("Zr94", 0.1738)
     clad.add_nuclide("Zr96", 0.0280)
 
-    cold_water = openmc.Material(name='Cold borated water', material_id=3)
+    cold_water = openmc.Material(3, name='Cold borated water')
     cold_water.set_density('atom/b-cm', 0.07416)
     cold_water.add_nuclide("H1", 2.0)
     cold_water.add_nuclide("O16", 1.0)
@@ -126,7 +126,7 @@ def pwr_core():
     cold_water.add_nuclide("B11", 2.689e-3)
     cold_water.add_s_alpha_beta('c_H_in_H2O')
 
-    hot_water = openmc.Material(name='Hot borated water', material_id=4)
+    hot_water = openmc.Material(4, name='Hot borated water')
     hot_water.set_density('atom/b-cm', 0.06614)
     hot_water.add_nuclide("H1", 2.0)
     hot_water.add_nuclide("O16", 1.0)
@@ -134,8 +134,7 @@ def pwr_core():
     hot_water.add_nuclide("B11", 2.689e-3)
     hot_water.add_s_alpha_beta('c_H_in_H2O')
 
-    rpv_steel = openmc.Material(name='Reactor pressure vessel steel',
-                                material_id=5)
+    rpv_steel = openmc.Material(5, name='Reactor pressure vessel steel')
     rpv_steel.set_density('g/cm3', 7.9)
     rpv_steel.add_nuclide("Fe54", 0.05437098, 'wo')
     rpv_steel.add_nuclide("Fe56", 0.88500663, 'wo')
@@ -148,8 +147,7 @@ def pwr_core():
     rpv_steel.add_nuclide("C0", 0.0025, 'wo')
     rpv_steel.add_nuclide("Cu63", 0.0013696, 'wo')
 
-    lower_rad_ref = openmc.Material(name='Lower radial reflector',
-                                    material_id=6)
+    lower_rad_ref = openmc.Material(6, name='Lower radial reflector')
     lower_rad_ref.set_density('g/cm3', 4.32)
     lower_rad_ref.add_nuclide("H1", 0.0095661, 'wo')
     lower_rad_ref.add_nuclide("O16", 0.0759107, 'wo')
@@ -164,8 +162,7 @@ def pwr_core():
     lower_rad_ref.add_nuclide("Cr52", 0.145407678031, 'wo')
     lower_rad_ref.add_s_alpha_beta('c_H_in_H2O')
 
-    upper_rad_ref = openmc.Material(name='Upper radial reflector /'
-                                         'Top plate region', material_id=7)
+    upper_rad_ref = openmc.Material(7, name='Upper radial reflector / Top plate region')
     upper_rad_ref.set_density('g/cm3', 4.28)
     upper_rad_ref.add_nuclide("H1", 0.0086117, 'wo')
     upper_rad_ref.add_nuclide("O16", 0.0683369, 'wo')
@@ -180,7 +177,7 @@ def pwr_core():
     upper_rad_ref.add_nuclide("Cr52", 0.146766614995, 'wo')
     upper_rad_ref.add_s_alpha_beta('c_H_in_H2O')
 
-    bot_plate = openmc.Material(name='Bottom plate region', material_id=8)
+    bot_plate = openmc.Material(8, name='Bottom plate region')
     bot_plate.set_density('g/cm3', 7.184)
     bot_plate.add_nuclide("H1", 0.0011505, 'wo')
     bot_plate.add_nuclide("O16", 0.0091296, 'wo')
@@ -195,8 +192,7 @@ def pwr_core():
     bot_plate.add_nuclide("Cr52", 0.157390026871, 'wo')
     bot_plate.add_s_alpha_beta('c_H_in_H2O')
 
-    bot_nozzle = openmc.Material(name='Bottom nozzle region',
-                                 material_id=9)
+    bot_nozzle = openmc.Material(9, name='Bottom nozzle region')
     bot_nozzle.set_density('g/cm3', 2.53)
     bot_nozzle.add_nuclide("H1", 0.0245014, 'wo')
     bot_nozzle.add_nuclide("O16", 0.1944274, 'wo')
@@ -211,7 +207,7 @@ def pwr_core():
     bot_nozzle.add_nuclide("Cr52", 0.124142524198, 'wo')
     bot_nozzle.add_s_alpha_beta('c_H_in_H2O')
 
-    top_nozzle = openmc.Material(name='Top nozzle region', material_id=10)
+    top_nozzle = openmc.Material(10, name='Top nozzle region')
     top_nozzle.set_density('g/cm3', 1.746)
     top_nozzle.add_nuclide("H1", 0.0358870, 'wo')
     top_nozzle.add_nuclide("O16", 0.2847761, 'wo')
@@ -226,7 +222,7 @@ def pwr_core():
     top_nozzle.add_nuclide("Cr52", 0.107931450781, 'wo')
     top_nozzle.add_s_alpha_beta('c_H_in_H2O')
 
-    top_fa = openmc.Material(name='Top of fuel assemblies', material_id=11)
+    top_fa = openmc.Material(11, name='Top of fuel assemblies')
     top_fa.set_density('g/cm3', 3.044)
     top_fa.add_nuclide("H1", 0.0162913, 'wo')
     top_fa.add_nuclide("O16", 0.1292776, 'wo')
@@ -239,8 +235,7 @@ def pwr_core():
     top_fa.add_nuclide("Zr96", 0.02511169542, 'wo')
     top_fa.add_s_alpha_beta('c_H_in_H2O')
 
-    bot_fa = openmc.Material(name='Bottom of fuel assemblies',
-                             material_id=12)
+    bot_fa = openmc.Material(12, name='Bottom of fuel assemblies')
     bot_fa.set_density('g/cm3', 1.762)
     bot_fa.add_nuclide("H1", 0.0292856, 'wo')
     bot_fa.add_nuclide("O16", 0.2323919, 'wo')
@@ -524,7 +519,7 @@ def pwr_assembly():
     root_cell.region = +min_x & -max_x & +min_y & -max_y
 
     # Create root Universe
-    model.geometry.root_universe = openmc.Universe(universe_id=0, name='root universe')
+    model.geometry.root_universe = openmc.Universe(name='root universe')
     model.geometry.root_universe.add_cell(root_cell)
 
     model.settings.batches = 10
@@ -609,7 +604,7 @@ def slab_mg(reps=None, as_macro=True):
     planes.append(openmc.ZPlane(z0=5.0, boundary_type='reflective'))
 
     # Define cells for each material
-    model.geometry.root_universe = openmc.Universe(universe_id=0, name='root universe')
+    model.geometry.root_universe = openmc.Universe(name='root universe')
     xy = +left & -right & +bottom & -top
     for i, mat in enumerate(model.materials):
         c = openmc.Cell(fill=mat, region=xy & +planes[i] & -planes[i + 1])
diff --git a/tests/test_asymmetric_lattice/inputs_true.dat b/tests/test_asymmetric_lattice/inputs_true.dat
index 32745dad1..e5ecbee27 100644
--- a/tests/test_asymmetric_lattice/inputs_true.dat
+++ b/tests/test_asymmetric_lattice/inputs_true.dat
@@ -56,7 +56,7 @@
 </geometry>
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-    <material id="1" name="Fuel">
+    <material id="1" name="UOX fuel">
         <density units="g/cm3" value="10.062" />
         <nuclide ao="4.9476e-06" name="U234" />
         <nuclide ao="0.00048218" name="U235" />
@@ -105,7 +105,7 @@
         <nuclide name="Zr96" wo="0.0216912612" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="2" name="Cladding">
+    <material id="2" name="Zircaloy">
         <density units="g/cm3" value="5.77" />
         <nuclide ao="0.5145" name="Zr90" />
         <nuclide ao="0.1122" name="Zr91" />
@@ -157,7 +157,7 @@
         <nuclide name="Cr52" wo="0.145407678031" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="7" name="Upper radial reflector /Top plate region">
+    <material id="7" name="Upper radial reflector / Top plate region">
         <density units="g/cm3" value="4.28" />
         <nuclide name="H1" wo="0.0086117" />
         <nuclide name="O16" wo="0.0683369" />
diff --git a/tests/test_diff_tally/inputs_true.dat b/tests/test_diff_tally/inputs_true.dat
index 0d75e48c6..566796995 100644
--- a/tests/test_diff_tally/inputs_true.dat
+++ b/tests/test_diff_tally/inputs_true.dat
@@ -148,7 +148,7 @@
 </geometry>
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-    <material id="1" name="Fuel">
+    <material id="1" name="UOX fuel">
         <density units="g/cm3" value="10.062" />
         <nuclide ao="4.9476e-06" name="U234" />
         <nuclide ao="0.00048218" name="U235" />
@@ -197,7 +197,7 @@
         <nuclide name="Zr96" wo="0.0216912612" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="2" name="Cladding">
+    <material id="2" name="Zircaloy">
         <density units="g/cm3" value="5.77" />
         <nuclide ao="0.5145" name="Zr90" />
         <nuclide ao="0.1122" name="Zr91" />
@@ -249,7 +249,7 @@
         <nuclide name="Cr52" wo="0.145407678031" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="7" name="Upper radial reflector /Top plate region">
+    <material id="7" name="Upper radial reflector / Top plate region">
         <density units="g/cm3" value="4.28" />
         <nuclide name="H1" wo="0.0086117" />
         <nuclide name="O16" wo="0.0683369" />
diff --git a/tests/test_filter_energyfun/inputs_true.dat b/tests/test_filter_energyfun/inputs_true.dat
index 48f6c5033..1593c5113 100644
--- a/tests/test_filter_energyfun/inputs_true.dat
+++ b/tests/test_filter_energyfun/inputs_true.dat
@@ -148,7 +148,7 @@
 </geometry>
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-    <material id="1" name="Fuel">
+    <material id="1" name="UOX fuel">
         <density units="g/cm3" value="10.062" />
         <nuclide ao="4.9476e-06" name="U234" />
         <nuclide ao="0.00048218" name="U235" />
@@ -197,7 +197,7 @@
         <nuclide name="Zr96" wo="0.0216912612" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="2" name="Cladding">
+    <material id="2" name="Zircaloy">
         <density units="g/cm3" value="5.77" />
         <nuclide ao="0.5145" name="Zr90" />
         <nuclide ao="0.1122" name="Zr91" />
@@ -250,7 +250,7 @@
         <nuclide name="Cr52" wo="0.145407678031" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="7" name="Upper radial reflector /Top plate region">
+    <material id="7" name="Upper radial reflector / Top plate region">
         <density units="g/cm3" value="4.28" />
         <nuclide name="H1" wo="0.0086117" />
         <nuclide name="O16" wo="0.0683369" />
diff --git a/tests/test_filter_mesh/inputs_true.dat b/tests/test_filter_mesh/inputs_true.dat
index 75c6dcc41..32700c098 100644
--- a/tests/test_filter_mesh/inputs_true.dat
+++ b/tests/test_filter_mesh/inputs_true.dat
@@ -148,7 +148,7 @@
 </geometry>
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-    <material id="1" name="Fuel">
+    <material id="1" name="UOX fuel">
         <density units="g/cm3" value="10.062" />
         <nuclide ao="4.9476e-06" name="U234" />
         <nuclide ao="0.00048218" name="U235" />
@@ -197,7 +197,7 @@
         <nuclide name="Zr96" wo="0.0216912612" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="2" name="Cladding">
+    <material id="2" name="Zircaloy">
         <density units="g/cm3" value="5.77" />
         <nuclide ao="0.5145" name="Zr90" />
         <nuclide ao="0.1122" name="Zr91" />
@@ -249,7 +249,7 @@
         <nuclide name="Cr52" wo="0.145407678031" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="7" name="Upper radial reflector /Top plate region">
+    <material id="7" name="Upper radial reflector / Top plate region">
         <density units="g/cm3" value="4.28" />
         <nuclide name="H1" wo="0.0086117" />
         <nuclide name="O16" wo="0.0683369" />
diff --git a/tests/test_iso_in_lab/inputs_true.dat b/tests/test_iso_in_lab/inputs_true.dat
index 682f8020f..9eee57672 100644
--- a/tests/test_iso_in_lab/inputs_true.dat
+++ b/tests/test_iso_in_lab/inputs_true.dat
@@ -148,7 +148,7 @@
 </geometry>
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-    <material id="1" name="Fuel">
+    <material id="1" name="UOX fuel">
         <density units="g/cm3" value="10.062" />
         <nuclide ao="4.9476e-06" name="U234" scattering="iso-in-lab" />
         <nuclide ao="0.00048218" name="U235" scattering="iso-in-lab" />
@@ -197,7 +197,7 @@
         <nuclide name="Zr96" scattering="iso-in-lab" wo="0.0216912612" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="2" name="Cladding">
+    <material id="2" name="Zircaloy">
         <density units="g/cm3" value="5.77" />
         <nuclide ao="0.5145" name="Zr90" scattering="iso-in-lab" />
         <nuclide ao="0.1122" name="Zr91" scattering="iso-in-lab" />
@@ -249,7 +249,7 @@
         <nuclide name="Cr52" scattering="iso-in-lab" wo="0.145407678031" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="7" name="Upper radial reflector /Top plate region">
+    <material id="7" name="Upper radial reflector / Top plate region">
         <density units="g/cm3" value="4.28" />
         <nuclide name="H1" scattering="iso-in-lab" wo="0.0086117" />
         <nuclide name="O16" scattering="iso-in-lab" wo="0.0683369" />
diff --git a/tests/test_mg_basic/inputs_true.dat b/tests/test_mg_basic/inputs_true.dat
index 7141e57dd..9e722493a 100644
--- a/tests/test_mg_basic/inputs_true.dat
+++ b/tests/test_mg_basic/inputs_true.dat
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='utf-8'?>
 <geometry>
-    <cell id="10000" material="10000" region="10000 -10001 10002 -10003 10004 -10005" universe="0" />
-    <cell id="10001" material="10001" region="10000 -10001 10002 -10003 10005 -10006" universe="0" />
-    <cell id="10002" material="10002" region="10000 -10001 10002 -10003 10006 -10007" universe="0" />
-    <cell id="10003" material="10003" region="10000 -10001 10002 -10003 10007 -10008" universe="0" />
-    <cell id="10004" material="10004" region="10000 -10001 10002 -10003 10008 -10009" universe="0" />
-    <cell id="10005" material="10005" region="10000 -10001 10002 -10003 10009 -10010" universe="0" />
-    <cell id="10006" material="10006" region="10000 -10001 10002 -10003 10010 -10011" universe="0" />
-    <cell id="10007" material="10007" region="10000 -10001 10002 -10003 10011 -10012" universe="0" />
-    <cell id="10008" material="10008" region="10000 -10001 10002 -10003 10012 -10013" universe="0" />
-    <cell id="10009" material="10009" region="10000 -10001 10002 -10003 10013 -10014" universe="0" />
-    <cell id="10010" material="10010" region="10000 -10001 10002 -10003 10014 -10015" universe="0" />
-    <cell id="10011" material="10011" region="10000 -10001 10002 -10003 10015 -10016" universe="0" />
+    <cell id="10000" material="10000" region="10000 -10001 10002 -10003 10004 -10005" universe="10000" />
+    <cell id="10001" material="10001" region="10000 -10001 10002 -10003 10005 -10006" universe="10000" />
+    <cell id="10002" material="10002" region="10000 -10001 10002 -10003 10006 -10007" universe="10000" />
+    <cell id="10003" material="10003" region="10000 -10001 10002 -10003 10007 -10008" universe="10000" />
+    <cell id="10004" material="10004" region="10000 -10001 10002 -10003 10008 -10009" universe="10000" />
+    <cell id="10005" material="10005" region="10000 -10001 10002 -10003 10009 -10010" universe="10000" />
+    <cell id="10006" material="10006" region="10000 -10001 10002 -10003 10010 -10011" universe="10000" />
+    <cell id="10007" material="10007" region="10000 -10001 10002 -10003 10011 -10012" universe="10000" />
+    <cell id="10008" material="10008" region="10000 -10001 10002 -10003 10012 -10013" universe="10000" />
+    <cell id="10009" material="10009" region="10000 -10001 10002 -10003 10013 -10014" universe="10000" />
+    <cell id="10010" material="10010" region="10000 -10001 10002 -10003 10014 -10015" universe="10000" />
+    <cell id="10011" material="10011" region="10000 -10001 10002 -10003 10015 -10016" universe="10000" />
     <surface boundary="reflective" coeffs="0.0" id="10000" type="x-plane" />
     <surface boundary="reflective" coeffs="10.0" id="10001" type="x-plane" />
     <surface boundary="reflective" coeffs="0.0" id="10002" type="y-plane" />
diff --git a/tests/test_mg_legendre/inputs_true.dat b/tests/test_mg_legendre/inputs_true.dat
index ca24a0dcf..05614b279 100644
--- a/tests/test_mg_legendre/inputs_true.dat
+++ b/tests/test_mg_legendre/inputs_true.dat
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <geometry>
-    <cell id="10000" material="10000" region="10000 -10001 10002 -10003 10004 -10005" universe="0" />
-    <cell id="10001" material="10001" region="10000 -10001 10002 -10003 10005 -10006" universe="0" />
-    <cell id="10002" material="10002" region="10000 -10001 10002 -10003 10006 -10007" universe="0" />
+    <cell id="10000" material="10000" region="10000 -10001 10002 -10003 10004 -10005" universe="10000" />
+    <cell id="10001" material="10001" region="10000 -10001 10002 -10003 10005 -10006" universe="10000" />
+    <cell id="10002" material="10002" region="10000 -10001 10002 -10003 10006 -10007" universe="10000" />
     <surface boundary="reflective" coeffs="0.0" id="10000" type="x-plane" />
     <surface boundary="reflective" coeffs="10.0" id="10001" type="x-plane" />
     <surface boundary="reflective" coeffs="0.0" id="10002" type="y-plane" />
diff --git a/tests/test_mg_max_order/inputs_true.dat b/tests/test_mg_max_order/inputs_true.dat
index a5feed722..07725dd31 100644
--- a/tests/test_mg_max_order/inputs_true.dat
+++ b/tests/test_mg_max_order/inputs_true.dat
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <geometry>
-    <cell id="10000" material="10000" region="10000 -10001 10002 -10003 10004 -10005" universe="0" />
-    <cell id="10001" material="10001" region="10000 -10001 10002 -10003 10005 -10006" universe="0" />
-    <cell id="10002" material="10002" region="10000 -10001 10002 -10003 10006 -10007" universe="0" />
+    <cell id="10000" material="10000" region="10000 -10001 10002 -10003 10004 -10005" universe="10000" />
+    <cell id="10001" material="10001" region="10000 -10001 10002 -10003 10005 -10006" universe="10000" />
+    <cell id="10002" material="10002" region="10000 -10001 10002 -10003 10006 -10007" universe="10000" />
     <surface boundary="reflective" coeffs="0.0" id="10000" type="x-plane" />
     <surface boundary="reflective" coeffs="10.0" id="10001" type="x-plane" />
     <surface boundary="reflective" coeffs="0.0" id="10002" type="y-plane" />
diff --git a/tests/test_mg_nuclide/inputs_true.dat b/tests/test_mg_nuclide/inputs_true.dat
index b5cb31b59..4225f7571 100644
--- a/tests/test_mg_nuclide/inputs_true.dat
+++ b/tests/test_mg_nuclide/inputs_true.dat
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='utf-8'?>
 <geometry>
-    <cell id="10000" material="10000" region="10000 -10001 10002 -10003 10004 -10005" universe="0" />
-    <cell id="10001" material="10001" region="10000 -10001 10002 -10003 10005 -10006" universe="0" />
-    <cell id="10002" material="10002" region="10000 -10001 10002 -10003 10006 -10007" universe="0" />
-    <cell id="10003" material="10003" region="10000 -10001 10002 -10003 10007 -10008" universe="0" />
-    <cell id="10004" material="10004" region="10000 -10001 10002 -10003 10008 -10009" universe="0" />
-    <cell id="10005" material="10005" region="10000 -10001 10002 -10003 10009 -10010" universe="0" />
-    <cell id="10006" material="10006" region="10000 -10001 10002 -10003 10010 -10011" universe="0" />
-    <cell id="10007" material="10007" region="10000 -10001 10002 -10003 10011 -10012" universe="0" />
-    <cell id="10008" material="10008" region="10000 -10001 10002 -10003 10012 -10013" universe="0" />
-    <cell id="10009" material="10009" region="10000 -10001 10002 -10003 10013 -10014" universe="0" />
-    <cell id="10010" material="10010" region="10000 -10001 10002 -10003 10014 -10015" universe="0" />
-    <cell id="10011" material="10011" region="10000 -10001 10002 -10003 10015 -10016" universe="0" />
+    <cell id="10000" material="10000" region="10000 -10001 10002 -10003 10004 -10005" universe="10000" />
+    <cell id="10001" material="10001" region="10000 -10001 10002 -10003 10005 -10006" universe="10000" />
+    <cell id="10002" material="10002" region="10000 -10001 10002 -10003 10006 -10007" universe="10000" />
+    <cell id="10003" material="10003" region="10000 -10001 10002 -10003 10007 -10008" universe="10000" />
+    <cell id="10004" material="10004" region="10000 -10001 10002 -10003 10008 -10009" universe="10000" />
+    <cell id="10005" material="10005" region="10000 -10001 10002 -10003 10009 -10010" universe="10000" />
+    <cell id="10006" material="10006" region="10000 -10001 10002 -10003 10010 -10011" universe="10000" />
+    <cell id="10007" material="10007" region="10000 -10001 10002 -10003 10011 -10012" universe="10000" />
+    <cell id="10008" material="10008" region="10000 -10001 10002 -10003 10012 -10013" universe="10000" />
+    <cell id="10009" material="10009" region="10000 -10001 10002 -10003 10013 -10014" universe="10000" />
+    <cell id="10010" material="10010" region="10000 -10001 10002 -10003 10014 -10015" universe="10000" />
+    <cell id="10011" material="10011" region="10000 -10001 10002 -10003 10015 -10016" universe="10000" />
     <surface boundary="reflective" coeffs="0.0" id="10000" type="x-plane" />
     <surface boundary="reflective" coeffs="10.0" id="10001" type="x-plane" />
     <surface boundary="reflective" coeffs="0.0" id="10002" type="y-plane" />
diff --git a/tests/test_mg_survival_biasing/inputs_true.dat b/tests/test_mg_survival_biasing/inputs_true.dat
index be2e6b2d9..de6e04644 100644
--- a/tests/test_mg_survival_biasing/inputs_true.dat
+++ b/tests/test_mg_survival_biasing/inputs_true.dat
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='utf-8'?>
 <geometry>
-    <cell id="10000" material="10000" region="10000 -10001 10002 -10003 10004 -10005" universe="0" />
-    <cell id="10001" material="10001" region="10000 -10001 10002 -10003 10005 -10006" universe="0" />
-    <cell id="10002" material="10002" region="10000 -10001 10002 -10003 10006 -10007" universe="0" />
-    <cell id="10003" material="10003" region="10000 -10001 10002 -10003 10007 -10008" universe="0" />
-    <cell id="10004" material="10004" region="10000 -10001 10002 -10003 10008 -10009" universe="0" />
-    <cell id="10005" material="10005" region="10000 -10001 10002 -10003 10009 -10010" universe="0" />
-    <cell id="10006" material="10006" region="10000 -10001 10002 -10003 10010 -10011" universe="0" />
-    <cell id="10007" material="10007" region="10000 -10001 10002 -10003 10011 -10012" universe="0" />
-    <cell id="10008" material="10008" region="10000 -10001 10002 -10003 10012 -10013" universe="0" />
-    <cell id="10009" material="10009" region="10000 -10001 10002 -10003 10013 -10014" universe="0" />
-    <cell id="10010" material="10010" region="10000 -10001 10002 -10003 10014 -10015" universe="0" />
-    <cell id="10011" material="10011" region="10000 -10001 10002 -10003 10015 -10016" universe="0" />
+    <cell id="10000" material="10000" region="10000 -10001 10002 -10003 10004 -10005" universe="10000" />
+    <cell id="10001" material="10001" region="10000 -10001 10002 -10003 10005 -10006" universe="10000" />
+    <cell id="10002" material="10002" region="10000 -10001 10002 -10003 10006 -10007" universe="10000" />
+    <cell id="10003" material="10003" region="10000 -10001 10002 -10003 10007 -10008" universe="10000" />
+    <cell id="10004" material="10004" region="10000 -10001 10002 -10003 10008 -10009" universe="10000" />
+    <cell id="10005" material="10005" region="10000 -10001 10002 -10003 10009 -10010" universe="10000" />
+    <cell id="10006" material="10006" region="10000 -10001 10002 -10003 10010 -10011" universe="10000" />
+    <cell id="10007" material="10007" region="10000 -10001 10002 -10003 10011 -10012" universe="10000" />
+    <cell id="10008" material="10008" region="10000 -10001 10002 -10003 10012 -10013" universe="10000" />
+    <cell id="10009" material="10009" region="10000 -10001 10002 -10003 10013 -10014" universe="10000" />
+    <cell id="10010" material="10010" region="10000 -10001 10002 -10003 10014 -10015" universe="10000" />
+    <cell id="10011" material="10011" region="10000 -10001 10002 -10003 10015 -10016" universe="10000" />
     <surface boundary="reflective" coeffs="0.0" id="10000" type="x-plane" />
     <surface boundary="reflective" coeffs="10.0" id="10001" type="x-plane" />
     <surface boundary="reflective" coeffs="0.0" id="10002" type="y-plane" />
diff --git a/tests/test_mg_tallies/inputs_true.dat b/tests/test_mg_tallies/inputs_true.dat
index 8120c8681..e2d09ac36 100644
--- a/tests/test_mg_tallies/inputs_true.dat
+++ b/tests/test_mg_tallies/inputs_true.dat
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='utf-8'?>
 <geometry>
-    <cell id="10000" material="10000" region="10000 -10001 10002 -10003 10004 -10005" universe="0" />
-    <cell id="10001" material="10001" region="10000 -10001 10002 -10003 10005 -10006" universe="0" />
-    <cell id="10002" material="10002" region="10000 -10001 10002 -10003 10006 -10007" universe="0" />
-    <cell id="10003" material="10003" region="10000 -10001 10002 -10003 10007 -10008" universe="0" />
-    <cell id="10004" material="10004" region="10000 -10001 10002 -10003 10008 -10009" universe="0" />
-    <cell id="10005" material="10005" region="10000 -10001 10002 -10003 10009 -10010" universe="0" />
-    <cell id="10006" material="10006" region="10000 -10001 10002 -10003 10010 -10011" universe="0" />
-    <cell id="10007" material="10007" region="10000 -10001 10002 -10003 10011 -10012" universe="0" />
-    <cell id="10008" material="10008" region="10000 -10001 10002 -10003 10012 -10013" universe="0" />
-    <cell id="10009" material="10009" region="10000 -10001 10002 -10003 10013 -10014" universe="0" />
-    <cell id="10010" material="10010" region="10000 -10001 10002 -10003 10014 -10015" universe="0" />
-    <cell id="10011" material="10011" region="10000 -10001 10002 -10003 10015 -10016" universe="0" />
+    <cell id="10000" material="10000" region="10000 -10001 10002 -10003 10004 -10005" universe="10000" />
+    <cell id="10001" material="10001" region="10000 -10001 10002 -10003 10005 -10006" universe="10000" />
+    <cell id="10002" material="10002" region="10000 -10001 10002 -10003 10006 -10007" universe="10000" />
+    <cell id="10003" material="10003" region="10000 -10001 10002 -10003 10007 -10008" universe="10000" />
+    <cell id="10004" material="10004" region="10000 -10001 10002 -10003 10008 -10009" universe="10000" />
+    <cell id="10005" material="10005" region="10000 -10001 10002 -10003 10009 -10010" universe="10000" />
+    <cell id="10006" material="10006" region="10000 -10001 10002 -10003 10010 -10011" universe="10000" />
+    <cell id="10007" material="10007" region="10000 -10001 10002 -10003 10011 -10012" universe="10000" />
+    <cell id="10008" material="10008" region="10000 -10001 10002 -10003 10012 -10013" universe="10000" />
+    <cell id="10009" material="10009" region="10000 -10001 10002 -10003 10013 -10014" universe="10000" />
+    <cell id="10010" material="10010" region="10000 -10001 10002 -10003 10014 -10015" universe="10000" />
+    <cell id="10011" material="10011" region="10000 -10001 10002 -10003 10015 -10016" universe="10000" />
     <surface boundary="reflective" coeffs="0.0" id="10000" type="x-plane" />
     <surface boundary="reflective" coeffs="10.0" id="10001" type="x-plane" />
     <surface boundary="reflective" coeffs="0.0" id="10002" type="y-plane" />
diff --git a/tests/test_mgxs_library_ce_to_mg/inputs_true.dat b/tests/test_mgxs_library_ce_to_mg/inputs_true.dat
index e31ee4d04..0ca4e0873 100644
--- a/tests/test_mgxs_library_ce_to_mg/inputs_true.dat
+++ b/tests/test_mgxs_library_ce_to_mg/inputs_true.dat
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <geometry>
-    <cell id="10000" material="10000" name="cell 1" region="-10000" universe="0" />
-    <cell id="10001" material="10001" name="cell 3" region="10000 -10001" universe="0" />
-    <cell id="10002" material="10002" name="cell 2" region="10001 10002 -10003 10004 -10005" universe="0" />
+    <cell id="10000" material="10000" name="Fuel" region="-10000" universe="0" />
+    <cell id="10001" material="10001" name="Cladding" region="10000 -10001" universe="0" />
+    <cell id="10002" material="10002" name="Water" region="10001 10002 -10003 10004 -10005" universe="0" />
     <surface coeffs="0 0 0.39218" id="10000" name="Fuel OR" type="z-cylinder" />
     <surface coeffs="0 0 0.4572" id="10001" name="Clad OR" type="z-cylinder" />
     <surface boundary="reflective" coeffs="-0.63" id="10002" name="left" type="x-plane" />
@@ -12,14 +12,14 @@
 </geometry>
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-    <material id="10000" name="Fuel">
+    <material id="10000" name="UO2 (2.4%)">
         <density units="g/cm3" value="10.29769" />
         <nuclide ao="4.4843e-06" name="U234" />
         <nuclide ao="0.00055815" name="U235" />
         <nuclide ao="0.022408" name="U238" />
         <nuclide ao="0.045829" name="O16" />
     </material>
-    <material id="10001" name="Cladding">
+    <material id="10001" name="Zircaloy">
         <density units="g/cm3" value="6.55" />
         <nuclide ao="0.021827" name="Zr90" />
         <nuclide ao="0.00476" name="Zr91" />
diff --git a/tests/test_mgxs_library_condense/inputs_true.dat b/tests/test_mgxs_library_condense/inputs_true.dat
index 79c7ea049..8059122b0 100644
--- a/tests/test_mgxs_library_condense/inputs_true.dat
+++ b/tests/test_mgxs_library_condense/inputs_true.dat
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <geometry>
-    <cell id="10000" material="10000" name="cell 1" region="-10000" universe="0" />
-    <cell id="10001" material="10001" name="cell 3" region="10000 -10001" universe="0" />
-    <cell id="10002" material="10002" name="cell 2" region="10001 10002 -10003 10004 -10005" universe="0" />
+    <cell id="10000" material="10000" name="Fuel" region="-10000" universe="0" />
+    <cell id="10001" material="10001" name="Cladding" region="10000 -10001" universe="0" />
+    <cell id="10002" material="10002" name="Water" region="10001 10002 -10003 10004 -10005" universe="0" />
     <surface coeffs="0 0 0.39218" id="10000" name="Fuel OR" type="z-cylinder" />
     <surface coeffs="0 0 0.4572" id="10001" name="Clad OR" type="z-cylinder" />
     <surface boundary="reflective" coeffs="-0.63" id="10002" name="left" type="x-plane" />
@@ -12,14 +12,14 @@
 </geometry>
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-    <material id="10000" name="Fuel">
+    <material id="10000" name="UO2 (2.4%)">
         <density units="g/cm3" value="10.29769" />
         <nuclide ao="4.4843e-06" name="U234" />
         <nuclide ao="0.00055815" name="U235" />
         <nuclide ao="0.022408" name="U238" />
         <nuclide ao="0.045829" name="O16" />
     </material>
-    <material id="10001" name="Cladding">
+    <material id="10001" name="Zircaloy">
         <density units="g/cm3" value="6.55" />
         <nuclide ao="0.021827" name="Zr90" />
         <nuclide ao="0.00476" name="Zr91" />
diff --git a/tests/test_mgxs_library_distribcell/inputs_true.dat b/tests/test_mgxs_library_distribcell/inputs_true.dat
index 79862b8bc..20b70b860 100644
--- a/tests/test_mgxs_library_distribcell/inputs_true.dat
+++ b/tests/test_mgxs_library_distribcell/inputs_true.dat
@@ -6,7 +6,7 @@
     <cell id="10003" material="10002" name="guide tube inner water" region="-10000" universe="10001" />
     <cell id="10004" material="10001" name="guide tube clad" region="10000 -10001" universe="10001" />
     <cell id="10005" material="10002" name="guide tube outer water" region="10001" universe="10001" />
-    <cell fill="10002" id="10006" name="root cell" region="10002 -10003 10004 -10005" universe="0" />
+    <cell fill="10002" id="10006" name="root cell" region="10002 -10003 10004 -10005" universe="10003" />
     <lattice id="10002" name="Fuel Assembly">
         <pitch>1.26 1.26</pitch>
         <dimension>17 17</dimension>
diff --git a/tests/test_mgxs_library_hdf5/inputs_true.dat b/tests/test_mgxs_library_hdf5/inputs_true.dat
index 79c7ea049..8059122b0 100644
--- a/tests/test_mgxs_library_hdf5/inputs_true.dat
+++ b/tests/test_mgxs_library_hdf5/inputs_true.dat
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <geometry>
-    <cell id="10000" material="10000" name="cell 1" region="-10000" universe="0" />
-    <cell id="10001" material="10001" name="cell 3" region="10000 -10001" universe="0" />
-    <cell id="10002" material="10002" name="cell 2" region="10001 10002 -10003 10004 -10005" universe="0" />
+    <cell id="10000" material="10000" name="Fuel" region="-10000" universe="0" />
+    <cell id="10001" material="10001" name="Cladding" region="10000 -10001" universe="0" />
+    <cell id="10002" material="10002" name="Water" region="10001 10002 -10003 10004 -10005" universe="0" />
     <surface coeffs="0 0 0.39218" id="10000" name="Fuel OR" type="z-cylinder" />
     <surface coeffs="0 0 0.4572" id="10001" name="Clad OR" type="z-cylinder" />
     <surface boundary="reflective" coeffs="-0.63" id="10002" name="left" type="x-plane" />
@@ -12,14 +12,14 @@
 </geometry>
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-    <material id="10000" name="Fuel">
+    <material id="10000" name="UO2 (2.4%)">
         <density units="g/cm3" value="10.29769" />
         <nuclide ao="4.4843e-06" name="U234" />
         <nuclide ao="0.00055815" name="U235" />
         <nuclide ao="0.022408" name="U238" />
         <nuclide ao="0.045829" name="O16" />
     </material>
-    <material id="10001" name="Cladding">
+    <material id="10001" name="Zircaloy">
         <density units="g/cm3" value="6.55" />
         <nuclide ao="0.021827" name="Zr90" />
         <nuclide ao="0.00476" name="Zr91" />
diff --git a/tests/test_mgxs_library_mesh/inputs_true.dat b/tests/test_mgxs_library_mesh/inputs_true.dat
index b0db8a9c4..33bab8d54 100644
--- a/tests/test_mgxs_library_mesh/inputs_true.dat
+++ b/tests/test_mgxs_library_mesh/inputs_true.dat
@@ -148,7 +148,7 @@
 </geometry>
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-    <material id="1" name="Fuel">
+    <material id="1" name="UOX fuel">
         <density units="g/cm3" value="10.062" />
         <nuclide ao="4.9476e-06" name="U234" />
         <nuclide ao="0.00048218" name="U235" />
@@ -197,7 +197,7 @@
         <nuclide name="Zr96" wo="0.0216912612" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="2" name="Cladding">
+    <material id="2" name="Zircaloy">
         <density units="g/cm3" value="5.77" />
         <nuclide ao="0.5145" name="Zr90" />
         <nuclide ao="0.1122" name="Zr91" />
@@ -249,7 +249,7 @@
         <nuclide name="Cr52" wo="0.145407678031" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="7" name="Upper radial reflector /Top plate region">
+    <material id="7" name="Upper radial reflector / Top plate region">
         <density units="g/cm3" value="4.28" />
         <nuclide name="H1" wo="0.0086117" />
         <nuclide name="O16" wo="0.0683369" />
diff --git a/tests/test_mgxs_library_no_nuclides/inputs_true.dat b/tests/test_mgxs_library_no_nuclides/inputs_true.dat
index 79c7ea049..8059122b0 100644
--- a/tests/test_mgxs_library_no_nuclides/inputs_true.dat
+++ b/tests/test_mgxs_library_no_nuclides/inputs_true.dat
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <geometry>
-    <cell id="10000" material="10000" name="cell 1" region="-10000" universe="0" />
-    <cell id="10001" material="10001" name="cell 3" region="10000 -10001" universe="0" />
-    <cell id="10002" material="10002" name="cell 2" region="10001 10002 -10003 10004 -10005" universe="0" />
+    <cell id="10000" material="10000" name="Fuel" region="-10000" universe="0" />
+    <cell id="10001" material="10001" name="Cladding" region="10000 -10001" universe="0" />
+    <cell id="10002" material="10002" name="Water" region="10001 10002 -10003 10004 -10005" universe="0" />
     <surface coeffs="0 0 0.39218" id="10000" name="Fuel OR" type="z-cylinder" />
     <surface coeffs="0 0 0.4572" id="10001" name="Clad OR" type="z-cylinder" />
     <surface boundary="reflective" coeffs="-0.63" id="10002" name="left" type="x-plane" />
@@ -12,14 +12,14 @@
 </geometry>
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-    <material id="10000" name="Fuel">
+    <material id="10000" name="UO2 (2.4%)">
         <density units="g/cm3" value="10.29769" />
         <nuclide ao="4.4843e-06" name="U234" />
         <nuclide ao="0.00055815" name="U235" />
         <nuclide ao="0.022408" name="U238" />
         <nuclide ao="0.045829" name="O16" />
     </material>
-    <material id="10001" name="Cladding">
+    <material id="10001" name="Zircaloy">
         <density units="g/cm3" value="6.55" />
         <nuclide ao="0.021827" name="Zr90" />
         <nuclide ao="0.00476" name="Zr91" />
diff --git a/tests/test_mgxs_library_nuclides/inputs_true.dat b/tests/test_mgxs_library_nuclides/inputs_true.dat
index 89541b4d5..ec9ff4f1b 100644
--- a/tests/test_mgxs_library_nuclides/inputs_true.dat
+++ b/tests/test_mgxs_library_nuclides/inputs_true.dat
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <geometry>
-    <cell id="10000" material="10000" name="cell 1" region="-10000" universe="0" />
-    <cell id="10001" material="10001" name="cell 3" region="10000 -10001" universe="0" />
-    <cell id="10002" material="10002" name="cell 2" region="10001 10002 -10003 10004 -10005" universe="0" />
+    <cell id="10000" material="10000" name="Fuel" region="-10000" universe="0" />
+    <cell id="10001" material="10001" name="Cladding" region="10000 -10001" universe="0" />
+    <cell id="10002" material="10002" name="Water" region="10001 10002 -10003 10004 -10005" universe="0" />
     <surface coeffs="0 0 0.39218" id="10000" name="Fuel OR" type="z-cylinder" />
     <surface coeffs="0 0 0.4572" id="10001" name="Clad OR" type="z-cylinder" />
     <surface boundary="reflective" coeffs="-0.63" id="10002" name="left" type="x-plane" />
@@ -12,14 +12,14 @@
 </geometry>
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-    <material id="10000" name="Fuel">
+    <material id="10000" name="UO2 (2.4%)">
         <density units="g/cm3" value="10.29769" />
         <nuclide ao="4.4843e-06" name="U234" />
         <nuclide ao="0.00055815" name="U235" />
         <nuclide ao="0.022408" name="U238" />
         <nuclide ao="0.045829" name="O16" />
     </material>
-    <material id="10001" name="Cladding">
+    <material id="10001" name="Zircaloy">
         <density units="g/cm3" value="6.55" />
         <nuclide ao="0.021827" name="Zr90" />
         <nuclide ao="0.00476" name="Zr91" />
diff --git a/tests/test_tallies/inputs_true.dat b/tests/test_tallies/inputs_true.dat
index 88ff72f9b..3123aedaf 100644
--- a/tests/test_tallies/inputs_true.dat
+++ b/tests/test_tallies/inputs_true.dat
@@ -148,7 +148,7 @@
 </geometry>
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-    <material id="1" name="Fuel">
+    <material id="1" name="UOX fuel">
         <density units="g/cm3" value="10.062" />
         <nuclide ao="4.9476e-06" name="U234" />
         <nuclide ao="0.00048218" name="U235" />
@@ -197,7 +197,7 @@
         <nuclide name="Zr96" wo="0.0216912612" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="2" name="Cladding">
+    <material id="2" name="Zircaloy">
         <density units="g/cm3" value="5.77" />
         <nuclide ao="0.5145" name="Zr90" />
         <nuclide ao="0.1122" name="Zr91" />
@@ -249,7 +249,7 @@
         <nuclide name="Cr52" wo="0.145407678031" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="7" name="Upper radial reflector /Top plate region">
+    <material id="7" name="Upper radial reflector / Top plate region">
         <density units="g/cm3" value="4.28" />
         <nuclide name="H1" wo="0.0086117" />
         <nuclide name="O16" wo="0.0683369" />
diff --git a/tests/test_tally_aggregation/inputs_true.dat b/tests/test_tally_aggregation/inputs_true.dat
index 041221cb6..a48d240ea 100644
--- a/tests/test_tally_aggregation/inputs_true.dat
+++ b/tests/test_tally_aggregation/inputs_true.dat
@@ -148,7 +148,7 @@
 </geometry>
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-    <material id="1" name="Fuel">
+    <material id="1" name="UOX fuel">
         <density units="g/cm3" value="10.062" />
         <nuclide ao="4.9476e-06" name="U234" />
         <nuclide ao="0.00048218" name="U235" />
@@ -197,7 +197,7 @@
         <nuclide name="Zr96" wo="0.0216912612" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="2" name="Cladding">
+    <material id="2" name="Zircaloy">
         <density units="g/cm3" value="5.77" />
         <nuclide ao="0.5145" name="Zr90" />
         <nuclide ao="0.1122" name="Zr91" />
@@ -249,7 +249,7 @@
         <nuclide name="Cr52" wo="0.145407678031" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="7" name="Upper radial reflector /Top plate region">
+    <material id="7" name="Upper radial reflector / Top plate region">
         <density units="g/cm3" value="4.28" />
         <nuclide name="H1" wo="0.0086117" />
         <nuclide name="O16" wo="0.0683369" />
diff --git a/tests/test_tally_arithmetic/inputs_true.dat b/tests/test_tally_arithmetic/inputs_true.dat
index f98d4480d..9bacec1a1 100644
--- a/tests/test_tally_arithmetic/inputs_true.dat
+++ b/tests/test_tally_arithmetic/inputs_true.dat
@@ -148,7 +148,7 @@
 </geometry>
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-    <material id="1" name="Fuel">
+    <material id="1" name="UOX fuel">
         <density units="g/cm3" value="10.062" />
         <nuclide ao="4.9476e-06" name="U234" />
         <nuclide ao="0.00048218" name="U235" />
@@ -197,7 +197,7 @@
         <nuclide name="Zr96" wo="0.0216912612" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="2" name="Cladding">
+    <material id="2" name="Zircaloy">
         <density units="g/cm3" value="5.77" />
         <nuclide ao="0.5145" name="Zr90" />
         <nuclide ao="0.1122" name="Zr91" />
@@ -249,7 +249,7 @@
         <nuclide name="Cr52" wo="0.145407678031" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="7" name="Upper radial reflector /Top plate region">
+    <material id="7" name="Upper radial reflector / Top plate region">
         <density units="g/cm3" value="4.28" />
         <nuclide name="H1" wo="0.0086117" />
         <nuclide name="O16" wo="0.0683369" />
diff --git a/tests/test_tally_slice_merge/inputs_true.dat b/tests/test_tally_slice_merge/inputs_true.dat
index 93b4af5cd..4decaa81c 100644
--- a/tests/test_tally_slice_merge/inputs_true.dat
+++ b/tests/test_tally_slice_merge/inputs_true.dat
@@ -148,7 +148,7 @@
 </geometry>
 <?xml version='1.0' encoding='utf-8'?>
 <materials>
-    <material id="1" name="Fuel">
+    <material id="1" name="UOX fuel">
         <density units="g/cm3" value="10.062" />
         <nuclide ao="4.9476e-06" name="U234" />
         <nuclide ao="0.00048218" name="U235" />
@@ -197,7 +197,7 @@
         <nuclide name="Zr96" wo="0.0216912612" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="2" name="Cladding">
+    <material id="2" name="Zircaloy">
         <density units="g/cm3" value="5.77" />
         <nuclide ao="0.5145" name="Zr90" />
         <nuclide ao="0.1122" name="Zr91" />
@@ -249,7 +249,7 @@
         <nuclide name="Cr52" wo="0.145407678031" />
         <sab name="c_H_in_H2O" />
     </material>
-    <material id="7" name="Upper radial reflector /Top plate region">
+    <material id="7" name="Upper radial reflector / Top plate region">
         <density units="g/cm3" value="4.28" />
         <nuclide name="H1" wo="0.0086117" />
         <nuclide name="O16" wo="0.0683369" />