diff --git a/amd/src/report-viewer-components.js b/amd/src/report-viewer-components.js
index 2abbf70..a436849 100644
--- a/amd/src/report-viewer-components.js
+++ b/amd/src/report-viewer-components.js
@@ -745,20 +745,16 @@ export default {
             methods: {
                 completion_icon(completion) {
                     switch(completion){
-                        default: // case "incomplete"
-                            return "circle-o";
-                        case "pending":
-                            return "question-circle";
-                        case "failed":
-                            return "times-circle";                            
                         case "progress":
                             return "exclamation-circle";
-                        case "completed":
+                        case "complete":
                             return "check-circle";
-                        case "good":
-                            return "check-circle";
-                        case "excellent":
+                        case "complete-pass":
                             return "check-circle";
+                        case "complete-fail":
+                            return "times-circle";
+                        default: // case "incomplete"
+                            return "circle-o";
                     }
                 },
 
@@ -771,8 +767,8 @@ export default {
                 <template v-for='cgroup in value.conditions'>
                     <tr>
                         <th colspan='2'>{{cgroup.title}}</th>
-                        <th><i :class="'fa fa-'+completion_icon(completion_tag(cgroup))+' r-completion-'+completion_tag(cgroup)"
-                        :title="text['completion_'+completion_tag(cgroup)]"></i></th>
+                        <th><i :class="'fa fa-'+completion_icon(cgroup.status)+' r-completion-'+cgroup.status"
+                        :title="text['completion_'+cgroup.status]"></i></th>
                     </tr>
                     <tr v-for='ci in cgroup.items'>
                         <td><span v-if='guestmode'>{{ci.title}}</span>
diff --git a/classes/corecompletioninfo.php b/classes/corecompletioninfo.php
index b24c9b8..e919f16 100644
--- a/classes/corecompletioninfo.php
+++ b/classes/corecompletioninfo.php
@@ -242,7 +242,7 @@ class corecompletioninfo {
                         "type" => $COMPLETION_CRITERIA_TYPES[$type],
                         "aggregation" => self::aggregation_handle($typeaggregation),
                         "completed" => $completed,
-                        "status" => $completed?"completed":"incomplete",
+                        "status" => $completed?"complete":"incomplete",
                         "title" => reset($completions)->get_criteria()->get_type_title(),
                         "items" => [],
                     ];