diff --git a/NunitReportParser/Program.cs b/NunitReportParser/Program.cs
index a7ae161d357e10b0df58714a8030485f223abb7a..85289d5c3f6f2e7519cf1bf019c78aedf0a466b8 100644
--- a/NunitReportParser/Program.cs
+++ b/NunitReportParser/Program.cs
@@ -113,7 +113,7 @@ namespace NunitReport
                     {
                         double maxGrade = (double) task["tests"][caseName]["grade"];
                         int subModuleNumber = (int) task["tests"][caseName]["subModuleNumber"];
-                        if (testcase.Attributes["result"].Value == "Success")
+                        if (testcase.Attributes["result"].Value == "Passed" || testcase.Attributes["result"].Value == "Success")
                         {
                             if (!countedGrades.ContainsKey(subModuleNumber))
                             {
diff --git a/grades/Grades.json b/grades/Grades.json
index b619ec1c74f7b53e8ac648f3f426f5890f0b28cb..ee51930bdba08c9db04401c45fcd6865a9d6acf5 100644
--- a/grades/Grades.json
+++ b/grades/Grades.json
@@ -214,7 +214,7 @@
             },
          }
       },
-      { "name": "TestGeneratedLexer",
+      { "namespace": "TestGeneratedLexer",
         "tests": {
            "TestIdCount":  { 
                 "grade": 1.5,
@@ -301,7 +301,7 @@
             }
         }
       },
-      { "name": "TestASTParser",
+      { "namespace": "TestASTParser",
         "tests": {
            "TestWhile":  { 
                 "grade": 2,
@@ -333,7 +333,7 @@
             }
         }
       },
-      { "name": "TestCodeGenerator",
+      { "namespace": "TestCodeGenerator",
         "tests": {
            "SmokeTest":  { 
                 "grade": 0,
@@ -361,7 +361,7 @@
             },
         }
       },
-      { "name": "TestVisitors",
+      { "namespace": "TestVisitors",
         "tests": {
            "NoLoopTest":  { 
                 "grade": 0.5,