diff --git a/Tests/Importer/ZaaImporter/LaurisItemTest.cs b/Tests/Importer/ZaaImporter/LaurisItemTest.cs
index 47383c9..3caee25 100755
--- a/Tests/Importer/ZaaImporter/LaurisItemTest.cs
+++ b/Tests/Importer/ZaaImporter/LaurisItemTest.cs
@@ -153,7 +153,7 @@ namespace Tests.Importer.ZaaImporter
 
         [TestCase("Albumin (SU)/die: 149.9 [<= 30] mg/d; ", Material.SU)]
         [TestCase("Gesamt-Eiweiss/Creatinin (PU): 281 [<= 70] mg/g Crea;", Material.U)]
-        [TestCase("Cystatin C (N Latex): 2.37 [0.57 - 0.96] mg/l; ", Material.B)]
+        [TestCase("Cystatin C (N Latex): 2.37 [0.57 - 0.96] mg/l; ", Material.S)]
         public void ParseLaurisMaterial(string laurisString, Material expectedMaterial)
         {
             LaurisItem i = new LaurisItem(laurisString);
diff --git a/zaaReloaded2/LabModel/LabItem.cs b/zaaReloaded2/LabModel/LabItem.cs
index a95de4b..8e2ce7d 100755
--- a/zaaReloaded2/LabModel/LabItem.cs
+++ b/zaaReloaded2/LabModel/LabItem.cs
@@ -206,13 +206,14 @@ namespace zaaReloaded2.LabModel
         {
             get
             {
-                if (Material == LabModel.Material.B)
+                switch (Material)
                 {
-                    return Name;
-                }
-                else
-                {
-                    return String.Format("{0}-{1}", Material.ToString(), Name);
+                    case Material.S:
+                    case Material.E:
+                    case Material.B:
+                        return Name;
+                    default:
+                        return String.Format("{0}-{1}", Material.ToString(), Name);
                 }
             }
         }