diff --git a/lib/adminlib.php b/lib/adminlib.php
index 95444c09148..f4bc86df4b7 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -47,7 +47,7 @@ function upgrade_db($version, $release) {
 
     $return_url = "$CFG->wwwroot/$CFG->admin/index.php";
     if ($unittest) {
-        $return_url = "$CFG->wwwroot/$CFG->admin/report/simpletest/index.php?continuesetuptesttables=$continuesetuptesttables&upgradetesttables=$upgradetesttables";
+        $return_url = "$CFG->wwwroot/$CFG->admin/report/unittest/index.php?continuesetuptesttables=$continuesetuptesttables&upgradetesttables=$upgradetesttables";
     }
 
     /// set install/upgrade autocontinue session flag
@@ -1419,7 +1419,7 @@ function create_admin_user($user_input=NULL) {
               redirect("$CFG->wwwroot/user/editadvanced.php?id=$user->id");  // Edit thyself
             }
         } else {
-            redirect("$CFG->wwwroot/admin/report/simpletest/index.php?testtablesok=1");
+            redirect("$CFG->wwwroot/admin/report/unittest/index.php?testtablesok=1");
         }
     } else {
         print_error('cannotcreateadminuser', 'debug');
diff --git a/theme/oceanblue/styles_color.css b/theme/oceanblue/styles_color.css
index af745006a76..e021942b15c 100644
--- a/theme/oceanblue/styles_color.css
+++ b/theme/oceanblue/styles_color.css
@@ -202,7 +202,7 @@ table.formtable tbody th {
  *** Header
  ***/
 
-.breadcrumb .sep, #admin-report-simpletest-index .sep {
+.breadcrumb .sep, #admin-report-unittest-index .sep {
   color:#6666CC;
 }
 
@@ -291,31 +291,31 @@ table.flexible .r1 {
   background-color: #fafafa;
 }
 
-#admin-report-simpletest-index span.notice {
+#admin-report-unittest-index span.notice {
   color: teal;
 }
 
-#admin-report-simpletest-index b.pass {
+#admin-report-unittest-index b.pass {
   color: green;
 }
 
-#admin-report-simpletest-index b.fail, b.exception {
+#admin-report-unittest-index b.fail, b.exception {
   color: red;
 }
 
-#admin-report-simpletest-index .exception, .exception pre {
+#admin-report-unittest-index .exception, .exception pre {
   background-color: #fdd;
 }
 
-#admin-report-simpletest-index .unittestsummary {
+#admin-report-unittest-index .unittestsummary {
   color: white;
 }
 
-#admin-report-simpletest-index .unittestsummary.failed {
+#admin-report-unittest-index .unittestsummary.failed {
   background-color: red;
 }
 
-#admin-report-simpletest-index .unittestsummary.passed {
+#admin-report-unittest-index .unittestsummary.passed {
   background-color: green;
 }
 
diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css
index d2a93231441..add490ee886 100644
--- a/theme/standard/styles_color.css
+++ b/theme/standard/styles_color.css
@@ -199,7 +199,7 @@ table.formtable tbody th {
  *** Header
  ***/
 
-.breadcrumb .sep, #admin-report-simpletest-index .sep {
+.breadcrumb .sep, #admin-report-unittest-index .sep {
   color:#aaa;
 }
 
@@ -294,31 +294,31 @@ table.flexible .r1 {
   background-color: #fafafa;
 }
 
-#admin-report-simpletest-index span.notice {
+#admin-report-unittest-index span.notice {
   color: teal;
 }
 
-#admin-report-simpletest-index b.pass {
+#admin-report-unittest-index b.pass {
   color: green;
 }
 
-#admin-report-simpletest-index b.fail, b.exception {
+#admin-report-unittest-index b.fail, b.exception {
   color: red;
 }
 
-#admin-report-simpletest-index .exception, .exception pre {
+#admin-report-unittest-index .exception, .exception pre {
   background-color: #fdd;
 }
 
-#admin-report-simpletest-index .unittestsummary {
+#admin-report-unittest-index .unittestsummary {
   color: white;
 }
 
-#admin-report-simpletest-index .unittestsummary.failed {
+#admin-report-unittest-index .unittestsummary.failed {
   background-color: red;
 }
 
-#admin-report-simpletest-index .unittestsummary.passed {
+#admin-report-unittest-index .unittestsummary.passed {
   background-color: green;
 }
 
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index a557bdfaf6b..f092cf4d214 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -999,11 +999,11 @@ body#admin-modules table.generaltable td.c0
   text-align: center;
 }
 
-#admin-report-simpletest-index .exception pre {
+#admin-report-unittest-index .exception pre {
   padding: 8px;
 }
 
-#admin-report-simpletest-index .unittestsummary {
+#admin-report-unittest-index .unittestsummary {
   padding: 8px;
   margin-top: 1em;
 }