diff --git a/smr/smr/assemblies.py b/smr/smr/assemblies.py
index b13d0f9..6f10aaa 100644
--- a/smr/smr/assemblies.py
+++ b/smr/smr/assemblies.py
@@ -215,7 +215,7 @@ def assembly_universes(ring_radii, num_axial, depleted):
                                            gtu, gtu,  gtu,  gtu, gtu,
                                              gtu,              gtu,
                                                gtu,   gtu,   gtu     ]
-        univs['Assembly (2.4%) no BAs' + comment] = \
+        univs['Assembly (2.4%)' + comment] = \
             make_assembly('Assembly (2.4%) no BAs' + comment, universes)
 
         # WITH CONTROL ROD D BANK
diff --git a/smr/smr/core.py b/smr/smr/core.py
index 2e75dfe..68f3275 100644
--- a/smr/smr/core.py
+++ b/smr/smr/core.py
@@ -47,65 +47,65 @@ def core_geometry(ring_radii, num_axial, depleted):
     universes[1, 1] = reflector['1,1']
     universes[1, 2] = reflector['NW']
     universes[1, 3] = assembly['Assembly (3.1%)']
-    universes[1, 4] = assembly['Assembly (2.4%) CR D']
+    universes[1, 4] = assembly['Assembly (3.1%)']
     universes[1, 5] = assembly['Assembly (3.1%)']
     universes[1, 6] = reflector['NE']
     universes[1, 7] = reflector['1,7']
 
     universes[2, 0] = reflector['2,0']
     universes[2, 1] = reflector['NW']
-    universes[2, 2] = assembly['Assembly (3.1%) instr']
-    universes[2, 3] = assembly['Assembly (2.4%) CR D']
-    universes[2, 4] = assembly['Assembly (3.1%) instr']
-    universes[2, 5] = assembly['Assembly (2.4%) CR D']
-    universes[2, 6] = assembly['Assembly (3.1%) instr']
+    universes[2, 2] = assembly['Assembly (3.1%)']
+    universes[2, 3] = assembly['Assembly (2.4%)']
+    universes[2, 4] = assembly['Assembly (1.6%)']
+    universes[2, 5] = assembly['Assembly (2.4%)']
+    universes[2, 6] = assembly['Assembly (3.1%)']
     universes[2, 7] = reflector['NE']
     universes[2, 8] = reflector['2,8']
 
     universes[3, 0] = reflector['3,0']
     universes[3, 1] = assembly['Assembly (3.1%)']
-    universes[3, 2] = assembly['Assembly (2.4%) CR D']
-    universes[3, 3] = assembly['Assembly (3.1%) instr']
-    universes[3, 4] = assembly['Assembly (2.4%) CR D']
-    universes[3, 5] = assembly['Assembly (3.1%) instr']
-    universes[3, 6] = assembly['Assembly (2.4%) CR D']
+    universes[3, 2] = assembly['Assembly (2.4%)']
+    universes[3, 3] = assembly['Assembly (1.6%)']
+    universes[3, 4] = assembly['Assembly (1.6%)']
+    universes[3, 5] = assembly['Assembly (1.6%)']
+    universes[3, 6] = assembly['Assembly (2.4%)']
     universes[3, 7] = assembly['Assembly (3.1%)']
     universes[3, 8] = reflector['3,8']
 
     universes[4, 0] = reflector['4,0']
-    universes[4, 1] = assembly['Assembly (2.4%) CR D']
-    universes[4, 2] = assembly['Assembly (3.1%) instr']
-    universes[4, 3] = assembly['Assembly (2.4%) CR D']
-    universes[4, 4] = assembly['Assembly (1.6%)']
-    universes[4, 5] = assembly['Assembly (2.4%) CR D']
-    universes[4, 6] = assembly['Assembly (3.1%) instr']
-    universes[4, 7] = assembly['Assembly (2.4%) CR D']
+    universes[4, 1] = assembly['Assembly (3.1%)']
+    universes[4, 2] = assembly['Assembly (1.6%)']
+    universes[4, 3] = assembly['Assembly (1.6%)']
+    universes[4, 4] = assembly['Assembly (2.4%)']
+    universes[4, 5] = assembly['Assembly (1.6%)']
+    universes[4, 6] = assembly['Assembly (1.6%)']
+    universes[4, 7] = assembly['Assembly (3.1%)']
     universes[4, 8] = reflector['4,8']
 
     universes[5, 0] = reflector['5,0']
     universes[5, 1] = assembly['Assembly (3.1%)']
-    universes[5, 2] = assembly['Assembly (2.4%) CR D']
-    universes[5, 3] = assembly['Assembly (3.1%) instr']
-    universes[5, 4] = assembly['Assembly (2.4%) CR D']
-    universes[5, 5] = assembly['Assembly (3.1%) instr']
-    universes[5, 6] = assembly['Assembly (2.4%) CR D']
+    universes[5, 2] = assembly['Assembly (2.4%)']
+    universes[5, 3] = assembly['Assembly (1.6%)']
+    universes[5, 4] = assembly['Assembly (1.6%)']
+    universes[5, 5] = assembly['Assembly (1.6%)']
+    universes[5, 6] = assembly['Assembly (2.4%)']
     universes[5, 7] = assembly['Assembly (3.1%)']
     universes[5, 8] = reflector['5,8']
 
     universes[6, 0] = reflector['6,0']
     universes[6, 1] = reflector['SW']
-    universes[6, 2] = assembly['Assembly (3.1%) instr']
-    universes[6, 3] = assembly['Assembly (2.4%) CR D']
-    universes[6, 4] = assembly['Assembly (3.1%) instr']
-    universes[6, 5] = assembly['Assembly (2.4%) CR D']
-    universes[6, 6] = assembly['Assembly (3.1%) instr']
+    universes[6, 2] = assembly['Assembly (3.1%)']
+    universes[6, 3] = assembly['Assembly (2.4%)']
+    universes[6, 4] = assembly['Assembly (1.6%)']
+    universes[6, 5] = assembly['Assembly (2.4%)']
+    universes[6, 6] = assembly['Assembly (3.1%)']
     universes[6, 7] = reflector['SE']
     universes[6, 8] = reflector['6,8']
 
     universes[7, 1] = reflector['7,1']
     universes[7, 2] = reflector['SW']
     universes[7, 3] = assembly['Assembly (3.1%)']
-    universes[7, 4] = assembly['Assembly (2.4%) CR D']
+    universes[7, 4] = assembly['Assembly (3.1%)']
     universes[7, 5] = assembly['Assembly (3.1%)']
     universes[7, 6] = reflector['SE']
     universes[7, 7] = reflector['7,7']