diff --git a/question/addquestion.php b/question/addquestion.php
index 7c1d3fe3aa2..fa262cdadc9 100644
--- a/question/addquestion.php
+++ b/question/addquestion.php
@@ -47,11 +47,11 @@ if (!$category = $DB->get_record('question_categories', array('id' => $categoryi
 if ($cmid) {
     list($module, $cm) = get_module_from_cmid($cmid);
     require_login($cm->course, false, $cm);
-    $thiscontext = get_context_instance(CONTEXT_MODULE, $cmid);
+    $thiscontext = context_module::instance($cmid);
     $hiddenparams['cmid'] = $cmid;
 } else if ($courseid) {
     require_login($courseid, false);
-    $thiscontext = get_context_instance(CONTEXT_COURSE, $courseid);
+    $thiscontext = context_course::instance($courseid);
     $module = null;
     $cm = null;
     $hiddenparams['courseid'] = $courseid;
diff --git a/question/editlib.php b/question/editlib.php
index b2414a769c3..fb80c60b1cd 100644
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -1586,7 +1586,7 @@ function question_edit_setup($edittab, $baseurl, $requirecmid = false, $requirec
         $courseid = $cm->course;
         $thispageurl->params(compact('cmid'));
         require_login($courseid, false, $cm);
-        $thiscontext = get_context_instance(CONTEXT_MODULE, $cmid);
+        $thiscontext = context_module::instance($cmid);
     } else {
         $module = null;
         $cm = null;
@@ -1598,7 +1598,7 @@ function question_edit_setup($edittab, $baseurl, $requirecmid = false, $requirec
         if ($courseid){
             $thispageurl->params(compact('courseid'));
             require_login($courseid, false);
-            $thiscontext = get_context_instance(CONTEXT_COURSE, $courseid);
+            $thiscontext = context_course::instance($courseid);
         } else {
             $thiscontext = null;
         }
diff --git a/question/engine/datalib.php b/question/engine/datalib.php
index e7f570ea5a1..667b78eb32f 100644
--- a/question/engine/datalib.php
+++ b/question/engine/datalib.php
@@ -1240,7 +1240,7 @@ class question_file_saver {
         global $USER;
 
         $fs = get_file_storage();
-        $usercontext = get_context_instance(CONTEXT_USER, $USER->id);
+        $usercontext = context_user::instance($USER->id);
 
         $files = $fs->get_area_files($usercontext->id, 'user', 'draft',
                 $draftitemid, 'sortorder, filepath, filename', false);
diff --git a/question/engine/tests/helpers.php b/question/engine/tests/helpers.php
index a03d0eacdbb..c3f7611f21a 100644
--- a/question/engine/tests/helpers.php
+++ b/question/engine/tests/helpers.php
@@ -628,7 +628,7 @@ abstract class qbehaviour_walkthrough_test_base extends question_testcase {
 
         $this->displayoptions = new question_display_options();
         $this->quba = question_engine::make_questions_usage_by_activity('unit_test',
-            get_context_instance(CONTEXT_SYSTEM));
+            context_system::instance());
     }
 
     protected function tearDown() {
diff --git a/question/engine/tests/questionattemptiterator_test.php b/question/engine/tests/questionattemptiterator_test.php
index 4ca8ed3cab6..ddc648182ef 100644
--- a/question/engine/tests/questionattemptiterator_test.php
+++ b/question/engine/tests/questionattemptiterator_test.php
@@ -44,7 +44,7 @@ class question_attempt_iterator_test extends advanced_testcase {
 
     protected function setUp() {
         $this->quba = question_engine::make_questions_usage_by_activity('unit_test',
-                get_context_instance(CONTEXT_SYSTEM));
+                context_system::instance());
         $this->quba->set_preferred_behaviour('deferredfeedback');
 
         $slot = $this->quba->add_question(test_question_maker::make_question('description'));
diff --git a/question/engine/tests/questionusagebyactivity_test.php b/question/engine/tests/questionusagebyactivity_test.php
index 71434ee5270..4caef125c3f 100644
--- a/question/engine/tests/questionusagebyactivity_test.php
+++ b/question/engine/tests/questionusagebyactivity_test.php
@@ -42,7 +42,7 @@ class question_usage_by_activity_test extends advanced_testcase {
     public function test_set_get_preferred_model() {
         // Set up
         $quba = question_engine::make_questions_usage_by_activity('unit_test',
-                get_context_instance(CONTEXT_SYSTEM));
+                context_system::instance());
 
         // Exercise SUT and verify.
         $quba->set_preferred_behaviour('deferredfeedback');
@@ -52,7 +52,7 @@ class question_usage_by_activity_test extends advanced_testcase {
     public function test_set_get_id() {
         // Set up
         $quba = question_engine::make_questions_usage_by_activity('unit_test',
-                get_context_instance(CONTEXT_SYSTEM));
+                context_system::instance());
 
         // Exercise SUT and verify
         $quba->set_id_from_database(123);
@@ -62,7 +62,7 @@ class question_usage_by_activity_test extends advanced_testcase {
     public function test_fake_id() {
         // Set up
         $quba = question_engine::make_questions_usage_by_activity('unit_test',
-                get_context_instance(CONTEXT_SYSTEM));
+                context_system::instance());
 
         // Exercise SUT and verify
         $this->assertNotEmpty($quba->get_id());
@@ -70,7 +70,7 @@ class question_usage_by_activity_test extends advanced_testcase {
 
     public function test_create_usage_and_add_question() {
         // Exercise SUT
-        $context = get_context_instance(CONTEXT_SYSTEM);
+        $context = context_system::instance();
         $quba = question_engine::make_questions_usage_by_activity('unit_test', $context);
         $quba->set_preferred_behaviour('deferredfeedback');
         $tf = test_question_maker::make_question('truefalse', 'true');
@@ -87,7 +87,7 @@ class question_usage_by_activity_test extends advanced_testcase {
     public function test_get_question() {
         // Set up.
         $quba = question_engine::make_questions_usage_by_activity('unit_test',
-                get_context_instance(CONTEXT_SYSTEM));
+                context_system::instance());
         $quba->set_preferred_behaviour('deferredfeedback');
         $tf = test_question_maker::make_question('truefalse', 'true');
         $slot = $quba->add_question($tf);
@@ -103,7 +103,7 @@ class question_usage_by_activity_test extends advanced_testcase {
         // Start a deferred feedback attempt with CBM and add the question to it.
         $tf = test_question_maker::make_question('truefalse', 'true');
         $quba = question_engine::make_questions_usage_by_activity('unit_test',
-                get_context_instance(CONTEXT_SYSTEM));
+                context_system::instance());
         $quba->set_preferred_behaviour('deferredcbm');
         $slot = $quba->add_question($tf);
         $quba->start_all_questions();
@@ -129,7 +129,7 @@ class question_usage_by_activity_test extends advanced_testcase {
         // Start a deferred feedback attempt with CBM and add the question to it.
         $tf = test_question_maker::make_question('truefalse', 'true');
         $quba = question_engine::make_questions_usage_by_activity('unit_test',
-                get_context_instance(CONTEXT_SYSTEM));
+                context_system::instance());
         $quba->set_preferred_behaviour('deferredcbm');
         $slot = $quba->add_question($tf);
         $quba->start_all_questions();
diff --git a/question/preview.php b/question/preview.php
index 56513e79ab1..57dc777fb45 100644
--- a/question/preview.php
+++ b/question/preview.php
@@ -50,11 +50,11 @@ $question = question_bank::load_question($id);
 if ($cmid = optional_param('cmid', 0, PARAM_INT)) {
     $cm = get_coursemodule_from_id(false, $cmid);
     require_login($cm->course, false, $cm);
-    $context = get_context_instance(CONTEXT_MODULE, $cmid);
+    $context = context_module::instance($cmid);
 
 } else if ($courseid = optional_param('courseid', 0, PARAM_INT)) {
     require_login($courseid);
-    $context = get_context_instance(CONTEXT_COURSE, $courseid);
+    $context = context_course::instance($courseid);
 
 } else {
     require_login();
diff --git a/question/question.php b/question/question.php
index 4dc2025e892..63f54ad613e 100644
--- a/question/question.php
+++ b/question/question.php
@@ -100,10 +100,10 @@ if ($movecontext && !$id){
 if ($cmid){
     list($module, $cm) = get_module_from_cmid($cmid);
     require_login($cm->course, false, $cm);
-    $thiscontext = get_context_instance(CONTEXT_MODULE, $cmid);
+    $thiscontext = context_module::instance($cmid);
 } elseif ($courseid) {
     require_login($courseid, false);
-    $thiscontext = get_context_instance(CONTEXT_COURSE, $courseid);
+    $thiscontext = context_course::instance($courseid);
     $module = null;
     $cm = null;
 } else {
diff --git a/question/type/questiontypebase.php b/question/type/questiontypebase.php
index 52e42cc7365..50bbe76ee1d 100644
--- a/question/type/questiontypebase.php
+++ b/question/type/questiontypebase.php
@@ -1005,7 +1005,7 @@ class question_type {
         $form->penalty = 0.3333333;
         $form->generalfeedback = "Well done";
 
-        $context = get_context_instance(CONTEXT_COURSE, $courseid);
+        $context = context_course::instance($courseid);
         $newcategory = question_make_default_categories(array($context));
         $form->category = $newcategory->id . ',1';
 
diff --git a/report/backups/index.php b/report/backups/index.php
index 5a705870a37..9dd18315137 100644
--- a/report/backups/index.php
+++ b/report/backups/index.php
@@ -76,7 +76,7 @@ foreach ($rs as $backuprow) {
 
     // Create the row and add it to the table
     $cells = array(
-        format_string($backuprow->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, $backuprow->courseid))),
+        format_string($backuprow->fullname, true, array('context' => context_course::instance($backuprow->courseid))),
         userdate($backuprow->laststarttime, $strftimedatetime),
         '-',
         userdate($backuprow->lastendtime, $strftimedatetime),
diff --git a/report/completion/index.php b/report/completion/index.php
index 2b8188465e4..820afc05f99 100644
--- a/report/completion/index.php
+++ b/report/completion/index.php
@@ -507,8 +507,8 @@ if (!$csv) {
 
                 // Display icon
                 $iconlink = $CFG->wwwroot.'/course/view.php?id='.$criterion->courseinstance;
-                $icontitle = format_string($crs->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, $crs->id, MUST_EXIST)));
-                $iconalt = format_string($crs->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, $crs->id)));
+                $icontitle = format_string($crs->fullname, true, array('context' => context_course::instance($crs->id, MUST_EXIST)));
+                $iconalt = format_string($crs->shortname, true, array('context' => context_course::instance($crs->id)));
                 break;
 
             case COMPLETION_CRITERIA_TYPE_ROLE:
diff --git a/report/completion/user.php b/report/completion/user.php
index 0a7988d7b7d..9d7767be4b4 100644
--- a/report/completion/user.php
+++ b/report/completion/user.php
@@ -175,7 +175,7 @@ foreach ($courses as $type => $infos) {
 
             // Get course info
             $c_course = $DB->get_record('course', array('id' => $c_info->course_id));
-            $course_context = get_context_instance(CONTEXT_COURSE, $c_course->id, MUST_EXIST);
+            $course_context = context_course::instance($c_course->id, MUST_EXIST);
             $course_name = format_string($c_course->fullname, true, array('context' => $course_context));
 
             // Get completions
diff --git a/report/courseoverview/index.php b/report/courseoverview/index.php
index 9fe5c13d40c..514c4cb3a6c 100644
--- a/report/courseoverview/index.php
+++ b/report/courseoverview/index.php
@@ -32,7 +32,7 @@ $time       = optional_param('time', 0, PARAM_INT);
 $numcourses = optional_param('numcourses', 20, PARAM_INT);
 
 if (empty($CFG->enablestats)) {
-    if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
+    if (has_capability('moodle/site:config', context_system::instance())) {
         redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3);
     } else {
         print_error('statsdisable');
diff --git a/report/courseoverview/reportsgraph.php b/report/courseoverview/reportsgraph.php
index 78142d1a2dc..d1dff384926 100644
--- a/report/courseoverview/reportsgraph.php
+++ b/report/courseoverview/reportsgraph.php
@@ -33,7 +33,7 @@ $numcourses = required_param('numcourses', PARAM_INT);
 
 require_login();
 
-require_capability('report/courseoverview:view', get_context_instance(CONTEXT_SYSTEM));
+require_capability('report/courseoverview:view', context_system::instance());
 
 stats_check_uptodate();
 
diff --git a/report/log/index.php b/report/log/index.php
index a672f2af990..342c0abd10e 100644
--- a/report/log/index.php
+++ b/report/log/index.php
@@ -111,7 +111,7 @@ if ($hostid == $CFG->mnet_localhost_id) {
 
 require_login($course);
 
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 
 require_capability('report/log:view', $context);
 
diff --git a/report/log/locallib.php b/report/log/locallib.php
index dd543b099f7..d0bd44cf936 100644
--- a/report/log/locallib.php
+++ b/report/log/locallib.php
@@ -97,12 +97,12 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0,
         $showcourses = 1;
     }
 
-    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
+    $sitecontext = context_system::instance();
 
     // Context for remote data is always SITE
     // Groups for remote data are always OFF
     if ($hostid == $CFG->mnet_localhost_id) {
-        $context = get_context_instance(CONTEXT_COURSE, $course->id);
+        $context = context_course::instance($course->id);
 
         /// Setup for group handling.
         if ($course->groupmode == SEPARATEGROUPS and !has_capability('moodle/site:accessallgroups', $context)) {
@@ -397,8 +397,8 @@ function report_log_print_selector_form($course, $selecteduser=0, $selecteddate=
         $showcourses = 1;
     }
 
-    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
-    $context = get_context_instance(CONTEXT_COURSE, $course->id);
+    $sitecontext = context_system::instance();
+    $context = context_course::instance($course->id);
 
     /// Setup for group handling.
     if ($course->groupmode == SEPARATEGROUPS and !has_capability('moodle/site:accessallgroups', $context)) {
diff --git a/report/outline/index.php b/report/outline/index.php
index c7abae3e4a0..f652ddf5bbb 100644
--- a/report/outline/index.php
+++ b/report/outline/index.php
@@ -34,7 +34,7 @@ $PAGE->set_url('/report/outline/index.php', array('id'=>$id));
 $PAGE->set_pagelayout('report');
 
 require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 require_capability('report/outline:view', $context);
 
 add_to_log($course->id, 'course', 'report outline', "report/outline/index.php?id=$course->id", $course->id);
diff --git a/report/participation/index.php b/report/participation/index.php
index cd7fd3f19ab..a2032652df6 100644
--- a/report/participation/index.php
+++ b/report/participation/index.php
@@ -60,7 +60,7 @@ if ($roleid != 0 and !$role = $DB->get_record('role', array('id'=>$roleid))) {
 }
 
 require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 require_capability('report/participation:view', $context);
 
 add_to_log($course->id, "course", "report participation", "report/participation/index.php?id=$course->id", $course->id);
diff --git a/report/security/locallib.php b/report/security/locallib.php
index 12d99a8dadc..65736291ca9 100644
--- a/report/security/locallib.php
+++ b/report/security/locallib.php
@@ -781,7 +781,7 @@ function report_security_check_riskbackup($detailed=false) {
     $result->status  = null;
     $result->link    = null;
 
-    $syscontext = get_context_instance(CONTEXT_SYSTEM);
+    $syscontext = context_system::instance();
 
     $params = array('capability'=>'moodle/backup:userinfo', 'permission'=>CAP_ALLOW, 'contextid'=>$syscontext->id);
     $sql = "SELECT DISTINCT r.id, r.name, r.shortname, r.sortorder, r.archetype
diff --git a/report/stats/index.php b/report/stats/index.php
index 8238cde2712..997d24194cf 100644
--- a/report/stats/index.php
+++ b/report/stats/index.php
@@ -58,7 +58,7 @@ if (!empty($userid)) {
 }
 
 require_login($course);
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 require_capability('report/stats:view', $context);
 
 $PAGE->set_url(new moodle_url('/report/stats/index.php', array('course' => $course->id,
@@ -87,7 +87,7 @@ if ($course->id == SITEID) {
 report_stats_report($course, $report, $mode, $user, $roleid, $time);
 
 if (empty($CFG->enablestats)) {
-    if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
+    if (has_capability('moodle/site:config', context_system::instance())) {
         redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3);
     } else {
         print_error('statsdisable');
diff --git a/report/stats/locallib.php b/report/stats/locallib.php
index e2ee27f697c..d576fd71129 100644
--- a/report/stats/locallib.php
+++ b/report/stats/locallib.php
@@ -41,7 +41,7 @@ function report_stats_mode_menu($course, $mode, $time, $url) {
     $options = array();
     $options[STATS_MODE_GENERAL] = get_string('statsmodegeneral');
     $options[STATS_MODE_DETAILED] = get_string('statsmodedetailed');
-    if (has_capability('report/stats:view', get_context_instance(CONTEXT_SYSTEM))) {
+    if (has_capability('report/stats:view', context_system::instance())) {
         $options[STATS_MODE_RANKED] = get_string('reports');
     }
     $popupurl = $url."?course=$course->id&time=$time";
@@ -88,7 +88,7 @@ function report_stats_report($course, $report, $mode, $user, $roleid, $time) {
     $courseoptions = array();
 
     foreach ($courses as $c) {
-        $context = get_context_instance(CONTEXT_COURSE, $c->id);
+        $context = context_course::instance($c->id);
 
         if (has_capability('report/stats:view', $context)) {
             $courseoptions[$c->id] = format_string($c->shortname, true, array('context' => $context));
@@ -228,7 +228,7 @@ function report_stats_report($course, $report, $mode, $user, $roleid, $time) {
                         $a[] = $stat->line2;
                     }
                     if (empty($CFG->loglifetime) || ($stat->timeend-(60*60*24)) >= (time()-60*60*24*$CFG->loglifetime)) {
-                        if (has_capability('report/log:view', get_context_instance(CONTEXT_COURSE, $course->id))) {
+                        if (has_capability('report/log:view', context_course::instance($course->id))) {
                             $a[] = '<a href="'.$CFG->wwwroot.'/report/log/index.php?id='.
                                 $course->id.'&amp;chooselog=1&amp;showusers=1&amp;showcourses=1&amp;user='
                                 .$userid.'&amp;date='.usergetmidnight($stat->timeend-(60*60*24)).'">'
@@ -282,7 +282,7 @@ function report_stats_report($course, $report, $mode, $user, $roleid, $time) {
                     krsort($rolesdata);
                     $row = array_merge(array($times[$time]),$rolesdata);
                     if (empty($CFG->loglifetime) || ($stat->timeend-(60*60*24)) >= (time()-60*60*24*$CFG->loglifetime)) {
-                        if (has_capability('report/log:view', get_context_instance(CONTEXT_COURSE, $course->id))) {
+                        if (has_capability('report/log:view', context_course::instance($course->id))) {
                             $row[] = '<a href="'.$CFG->wwwroot.'/report/log/index.php?id='
                                 .$course->id.'&amp;chooselog=1&amp;showusers=1&amp;showcourses=1&amp;user='.$userid
                                 .'&amp;date='.usergetmidnight($time-(60*60*24)).'">'
diff --git a/repository/coursefiles/lib.php b/repository/coursefiles/lib.php
index 3f2787d1b8e..c25be53ca12 100644
--- a/repository/coursefiles/lib.php
+++ b/repository/coursefiles/lib.php
@@ -74,7 +74,7 @@ class repository_coursefiles extends repository {
             $filepath = null;
             list($context, $course, $cm) = get_context_info_array($this->context->id);
             $courseid = is_object($course) ? $course->id : SITEID;
-            $context = get_context_instance(CONTEXT_COURSE, $courseid);
+            $context = context_course::instance($courseid);
         }
 
         if ($fileinfo = $browser->get_file_info($context, $component, $filearea, $itemid, $filepath, $filename)) {
diff --git a/repository/draftfiles_ajax.php b/repository/draftfiles_ajax.php
index 3857a0da965..a3ea3aa00b8 100644
--- a/repository/draftfiles_ajax.php
+++ b/repository/draftfiles_ajax.php
@@ -41,7 +41,7 @@ $action  = required_param('action', PARAM_ALPHA);
 $draftid = required_param('itemid', PARAM_INT);
 $filepath = optional_param('filepath', '/', PARAM_PATH);
 
-$user_context = get_context_instance(CONTEXT_USER, $USER->id);
+$user_context = context_user::instance($USER->id);
 
 echo $OUTPUT->header(); // send headers
 
diff --git a/repository/draftfiles_manager.php b/repository/draftfiles_manager.php
index 0bbc3a39042..abe84f5d091 100644
--- a/repository/draftfiles_manager.php
+++ b/repository/draftfiles_manager.php
@@ -63,7 +63,7 @@ $newfilename = optional_param('newfilename', '',   PARAM_FILE);
 $draftpath   = optional_param('draftpath', '/',    PARAM_PATH);
 
 // user context
-$user_context = get_context_instance(CONTEXT_USER, $USER->id);
+$user_context = context_user::instance($USER->id);
 
 
 $PAGE->set_context($user_context);
diff --git a/repository/lib.php b/repository/lib.php
index 2b64c23796e..dd00d82e353 100644
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -642,7 +642,7 @@ abstract class repository {
     public static function draftfile_exists($itemid, $filepath, $filename) {
         global $USER;
         $fs = get_file_storage();
-        $usercontext = get_context_instance(CONTEXT_USER, $USER->id);
+        $usercontext = context_user::instance($USER->id);
         if ($fs->get_file($usercontext->id, 'user', 'draft', $itemid, $filepath, $filename)) {
             return true;
         } else {
@@ -2200,7 +2200,7 @@ abstract class repository {
     public static function overwrite_existing_draftfile($itemid, $filepath, $filename, $newfilepath, $newfilename) {
         global $USER;
         $fs = get_file_storage();
-        $user_context = get_context_instance(CONTEXT_USER, $USER->id);
+        $user_context = context_user::instance($USER->id);
         if ($file = $fs->get_file($user_context->id, 'user', 'draft', $itemid, $filepath, $filename)) {
             if ($tempfile = $fs->get_file($user_context->id, 'user', 'draft', $itemid, $newfilepath, $newfilename)) {
                 // delete existing file to release filename
@@ -2226,7 +2226,7 @@ abstract class repository {
     public static function delete_tempfile_from_draft($draftitemid, $filepath, $filename) {
         global $USER;
         $fs = get_file_storage();
-        $user_context = get_context_instance(CONTEXT_USER, $USER->id);
+        $user_context = context_user::instance($USER->id);
         if ($file = $fs->get_file($user_context->id, 'user', 'draft', $draftitemid, $filepath, $filename)) {
             $file->delete();
             return true;
@@ -2643,13 +2643,13 @@ function initialise_filepicker($args) {
         $disable_types = $args->disable_types;
     }
 
-    $user_context = get_context_instance(CONTEXT_USER, $USER->id);
+    $user_context = context_user::instance($USER->id);
 
     list($context, $course, $cm) = get_context_info_array($context->id);
     $contexts = array($user_context, get_system_context());
     if (!empty($course)) {
         // adding course context
-        $contexts[] = get_context_instance(CONTEXT_COURSE, $course->id);
+        $contexts[] = context_course::instance($course->id);
     }
     $externallink = (int)get_config(null, 'repositoryallowexternallinks');
     $repositories = repository::get_instances(array(
diff --git a/repository/local/lib.php b/repository/local/lib.php
index d8898bfbab2..a4c511dcbee 100644
--- a/repository/local/lib.php
+++ b/repository/local/lib.php
@@ -74,7 +74,7 @@ class repository_local extends repository {
             if (!empty($this->context)) {
                 list($context, $course, $cm) = get_context_info_array($this->context->id);
                 if (is_object($course)) {
-                    $context = get_context_instance(CONTEXT_COURSE, $course->id);
+                    $context = context_course::instance($course->id);
                 } else {
                     $context = get_system_context();
                 }
@@ -373,7 +373,7 @@ class repository_local_file {
             } else if ($this->fileinfo instanceof file_info_context_coursecat) {
                 // This is a course category. For non-admins we do not display categories
                 $this->skip = empty($CFG->navshowmycoursecategories) &&
-                        !has_capability('moodle/course:update', get_context_instance(CONTEXT_SYSTEM));
+                        !has_capability('moodle/course:update', context_system::instance());
             }
         }
         return $this->skip;
diff --git a/repository/repository_ajax.php b/repository/repository_ajax.php
index 2452158490b..5c368778430 100644
--- a/repository/repository_ajax.php
+++ b/repository/repository_ajax.php
@@ -206,7 +206,7 @@ switch ($action) {
                 $record->filepath = trim($record->filepath, '/');
                 $record->filepath = '/'.$record->filepath.'/';
             }
-            $usercontext = get_context_instance(CONTEXT_USER, $USER->id);
+            $usercontext = context_user::instance($USER->id);
             $now = time();
             $record->contextid = $usercontext->id;
             $record->timecreated = $now;
diff --git a/repository/upload/lib.php b/repository/upload/lib.php
index 5b443a52a5a..e7c4ae4bc80 100644
--- a/repository/upload/lib.php
+++ b/repository/upload/lib.php
@@ -97,7 +97,7 @@ class repository_upload extends repository {
         $record->license  = $license;
         $record->author   = $author;
 
-        $context = get_context_instance(CONTEXT_USER, $USER->id);
+        $context = context_user::instance($USER->id);
         $elname = 'repo_upload_file';
 
         $fs = get_file_storage();
diff --git a/repository/user/lib.php b/repository/user/lib.php
index c7d7f3c542d..b2f4f1414e7 100644
--- a/repository/user/lib.php
+++ b/repository/user/lib.php
@@ -74,7 +74,7 @@ class repository_user extends repository {
         $filearea = 'private';
         $component = 'user';
         $itemid  = 0;
-        $context = get_context_instance(CONTEXT_USER, $USER->id);
+        $context = context_user::instance($USER->id);
 
         try {
             $browser = get_file_browser();