diff --git a/annotate.php b/annotate.php
index c6abe87..88744c7 100644
--- a/annotate.php
+++ b/annotate.php
@@ -53,7 +53,7 @@
 
     $PAGE->set_cm($cm);
 }
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 $PAGE->set_pagelayout('incourse');
 require_course_login($course, true, $cm);
 $ouwikioutput = $PAGE->get_renderer('mod_ouwiki');
diff --git a/basicpage.php b/basicpage.php
index 278aedb..3e080d5 100644
--- a/basicpage.php
+++ b/basicpage.php
@@ -64,7 +64,7 @@
 if (!$ouwiki) {
     print_error("Wiki ID is incorrect in database");
 }
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 
 global $ouwiki_nologin;
 if (empty($ouwiki_nologin)) {
diff --git a/delete.php b/delete.php
index 05eedd3..9956672 100644
--- a/delete.php
+++ b/delete.php
@@ -46,7 +46,7 @@
 
     $PAGE->set_cm($cm);
 }
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 $PAGE->set_pagelayout('incourse');
 require_course_login($course, true, $cm);
 
diff --git a/diff.php b/diff.php
index ee51894..78fde1e 100644
--- a/diff.php
+++ b/diff.php
@@ -48,7 +48,7 @@
 
     $PAGE->set_cm($cm);
 }
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 $PAGE->set_pagelayout('incourse');
 require_course_login($course, true, $cm);
 $ouwikioutput = $PAGE->get_renderer('mod_ouwiki');
diff --git a/edit.php b/edit.php
index 345d69c..c624f28 100644
--- a/edit.php
+++ b/edit.php
@@ -87,7 +87,7 @@
     $addsection = true;
 }
 
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 $PAGE->set_pagelayout('incourse');
 require_course_login($course, true, $cm);
 
diff --git a/entirewiki.php b/entirewiki.php
index 228eeb4..85bbe13 100644
--- a/entirewiki.php
+++ b/entirewiki.php
@@ -47,7 +47,7 @@
 
     $PAGE->set_cm($cm);
 }
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 $PAGE->set_pagelayout('incourse');
 require_course_login($course, true, $cm);
 
diff --git a/history.php b/history.php
index 22a2ef8..c674aa3 100644
--- a/history.php
+++ b/history.php
@@ -47,7 +47,7 @@
 
     $PAGE->set_cm($cm);
 }
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 $PAGE->set_pagelayout('incourse');
 require_course_login($course, true, $cm);
 $ouwikioutput = $PAGE->get_renderer('mod_ouwiki');
diff --git a/import.php b/import.php
index 11f4ba2..6a4a5ec 100644
--- a/import.php
+++ b/import.php
@@ -490,7 +490,7 @@
             // Add any attachments and image files to the page.
             // Information needed for files and attachments.
             $fs = get_file_storage();
-            $modcontext = get_context_instance(CONTEXT_MODULE, $selectedact->id);
+            $modcontext = context_module::instance($selectedact->id);
             $prevversion = $pageinfo->versionid;
             // Add any files.
             if ($oldfiles = $fs->get_area_files($modcontext->id, 'mod_ouwiki', 'content', $prevversion)) {
diff --git a/index.php b/index.php
index b3919e6..e7e06f1 100644
--- a/index.php
+++ b/index.php
@@ -43,7 +43,7 @@
 
 require_course_login($course->id, true);
 $PAGE->set_pagelayout('incourse');
-$context = get_context_instance(CONTEXT_COURSE, $course->id);
+$context = context_course::instance($course->id);
 
 add_to_log($course->id, 'ouwiki', 'view all', "index.php?id=$course->id", '');
 
diff --git a/lib.php b/lib.php
index 447dc1f..b8c3270 100644
--- a/lib.php
+++ b/lib.php
@@ -31,7 +31,7 @@ function ouwiki_add_instance($data, $mform) {
     global $DB;
 
     $cmid = $data->coursemodule;
-    $context = get_context_instance(CONTEXT_MODULE, $cmid);
+    $context = context_module::instance($cmid);
 
     if ($formdata = $data) {
         // Set up null values
@@ -715,7 +715,7 @@ function ouwiki_grade_item_delete($ouwiki) {
  */
 function ouwiki_cm_info_dynamic(cm_info $cm) {
     if (!has_capability('mod/ouwiki:view',
-            get_context_instance(CONTEXT_MODULE, $cm->id))) {
+            context_module::instance($cm->id))) {
         $cm->uservisible = false;
         $cm->set_available(false);
     }
diff --git a/locallib.php b/locallib.php
index 453e3d0..f417783 100644
--- a/locallib.php
+++ b/locallib.php
@@ -289,7 +289,7 @@ function ouwiki_init_pages($course, $cm, $ouwiki, $subwiki, $ouwiki) {
 
     $fs = get_file_storage();
     $zip = get_file_packer();
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context = context_module::instance($cm->id);
     $filepath = '/'.$context->id.'/mod_ouwiki/template/'.$ouwiki->id.$ouwiki->template;
     if ($file = $fs->get_file_by_hash(sha1($filepath)) AND !$file->is_directory()) {
         if (strpos($ouwiki->template, '.xml') !== false) {
@@ -1833,7 +1833,7 @@ function ouwiki_save_new_version($course, $cm, $ouwiki, $subwiki, $pagename, $co
 
     // information needed for attachments
     $fs = get_file_storage();
-    $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $modcontext = context_module::instance($cm->id);
     $prevversion = ($revertversionid) ? $revertversionid : $pageversion->versionid;
 
     // save new files connected with the version from the formdata if set
@@ -2809,7 +2809,7 @@ function ouwiki_get_last_modified($cm, $course, $userid = 0) {
     // Default applies no restriction
     $restrictjoin = '';
     $restrictwhere = '';
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context = context_module::instance($cm->id);
 
     switch($ouwiki->subwikis) {
         case OUWIKI_SUBWIKIS_SINGLE:
@@ -3002,7 +3002,7 @@ function ouwiki_can_view_participation($course, $ouwiki, $subwiki, $cm, $userid
     if (!$userid) {
         $userid = $USER->id;
     }
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context = context_module::instance($cm->id);
 
     $groupmode = groups_get_activity_groupmode($cm, $course);
     $groupid = $subwiki->groupid;
@@ -3464,7 +3464,7 @@ protected function load_base_data($subwikiid) {
             throw new portfolio_caller_exception('error_export', 'ouwiki');
         }
         $this->cm = $instances[$this->ouwiki->id];
-        $this->modcontext = get_context_instance(CONTEXT_MODULE, $this->cm->id);
+        $this->modcontext = context_module::instance($this->cm->id);
     }
 
     /**
@@ -3620,7 +3620,7 @@ public function expected_time() {
     }
 
     public function check_permissions() {
-        $context = get_context_instance(CONTEXT_MODULE, $this->cm->id);
+        $context = context_module::instance($this->cm->id);
         return (has_capability('mod/ouwiki:view', $context));
     }
 
diff --git a/participation.php b/participation.php
index db75d44..3b06074 100644
--- a/participation.php
+++ b/participation.php
@@ -56,7 +56,7 @@
 }
 
 $PAGE->set_cm($cm);
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 $PAGE->set_pagelayout('incourse');
 require_course_login($course, true, $cm);
 
@@ -73,7 +73,7 @@
 }
 
 // all enrolled users for table pagination
-$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+$coursecontext = context_course::instance($course->id);
 $participation = ouwiki_get_participation($ouwiki, $subwiki, $context, $groupid);
 
 // is grading enabled and available for the current user
diff --git a/renderer.php b/renderer.php
index be6f7fe..6538d84 100644
--- a/renderer.php
+++ b/renderer.php
@@ -40,7 +40,7 @@ class mod_ouwiki_renderer extends plugin_renderer_base {
     public function ouwiki_print_page($subwiki, $cm, $pageversion, $gewgaws = null,
             $page = 'history', $showwordcount = 0, $hideannotations = false) {
         $output = '';
-        $modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
+        $modcontext = context_module::instance($cm->id);
 
         global $CFG, $ouwikiinternalre;
 
diff --git a/revert.php b/revert.php
index ee3a471..09d2923 100644
--- a/revert.php
+++ b/revert.php
@@ -48,7 +48,7 @@
 
     $PAGE->set_cm($cm);
 }
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 $PAGE->set_pagelayout('incourse');
 require_course_login($course, true, $cm);
 $ouwikioutput = $PAGE->get_renderer('mod_ouwiki');
diff --git a/savegrades.php b/savegrades.php
index e748d25..11d7dbd 100644
--- a/savegrades.php
+++ b/savegrades.php
@@ -51,7 +51,7 @@
 
     $PAGE->set_cm($cm);
 }
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 require_course_login($course, true, $cm);
 
 $mode = '';
diff --git a/simpletest/test_participation.php b/simpletest/test_participation.php
index 85c3d6a..437ca31 100644
--- a/simpletest/test_participation.php
+++ b/simpletest/test_participation.php
@@ -80,7 +80,7 @@ class ouwiki_participation_test extends UnitTestCaseUsingDatabase {
     public function test_canview_course_wiki() {
         $ouwiki = $this->get_new_ouwiki($this->courses['single']->id, OUWIKI_SUBWIKIS_SINGLE);
         $cm = $this->get_new_course_module($this->courses['single']->id, $ouwiki->id, NOGROUPS);
-        $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+        $context = context_module::instance($cm->id);
         $subwiki = ouwiki_get_subwiki($this->courses['single'], $ouwiki, $cm,
             $context, 0, $this->admin->id, true);
 
@@ -108,7 +108,7 @@ public function test_canview_group_wiki() {
         $ouwiki = $this->get_new_ouwiki($this->courses['group']->id, OUWIKI_SUBWIKIS_GROUPS);
         $cm = $this->get_new_course_module($this->courses['group']->id,
             $ouwiki->id, SEPARATEGROUPS);
-        $context = get_context_instance(CONTEXT_MODULE, $cm->instance);
+        $context = context_module::instance($cm->instance);
         $group = $this->get_new_group($this->courses['group']->id);
         $subwiki = ouwiki_get_subwiki($this->courses['group'], $ouwiki, $cm,
             $context, $group->id, $this->admin->id, true);
@@ -130,7 +130,7 @@ public function test_canview_group_wiki() {
     public function test_participation() {
         $ouwiki = $this->get_new_ouwiki($this->courses['single']->id, OUWIKI_SUBWIKIS_SINGLE);
         $cm = $this->get_new_course_module($this->courses['single']->id, $ouwiki->id, NOGROUPS);
-        $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+        $context = context_module::instance($cm->id);
         $subwiki = ouwiki_get_subwiki($this->courses['single'], $ouwiki, $cm,
             $context, 0, $this->admin->id, true);
         $pageversion = ouwiki_get_current_page($subwiki, 'TEST PAGE', OUWIKI_GETPAGE_CREATE);
@@ -198,12 +198,10 @@ public function setUp() {
 
         // load test courses and contexts
         $this->courses['single'] = $this->get_new_course(0);
-        $this->contexts['single'] = get_context_instance(CONTEXT_COURSE,
-            $this->courses['single']->id);
+        $this->contexts['single'] = context_course::instance($this->courses['single']->id);
 
         $this->courses['group'] = $this->get_new_course(1);
-        $this->contexts['group'] = get_context_instance(CONTEXT_COURSE,
-            $this->courses['group']->id);
+        $this->contexts['group'] = context_course::instance($this->courses['group']->id);
 
         $this->admin      = $this->get_new_user('admin');
         $this->teacher    = $this->get_new_user('editingteacher');
diff --git a/simpletest/testlocallib.php b/simpletest/testlocallib.php
index 8a9361e..90af22e 100644
--- a/simpletest/testlocallib.php
+++ b/simpletest/testlocallib.php
@@ -182,7 +182,7 @@ public function test_ouwiki_get_subwiki() {
         // Test whole course wiki.
         $ouwiki = $this->get_new_ouwiki($course->id, OUWIKI_SUBWIKIS_SINGLE);
         $cm = $this->get_new_course_module($course->id, $ouwiki->id, NOGROUPS);
-        $context = get_context_instance(CONTEXT_MODULE, $cm->instance);
+        $context = context_module::instance($cm->instance);
         $groupid = 0;
 
         // subwiki with 'create'
@@ -201,7 +201,7 @@ public function test_ouwiki_get_subwiki() {
 
             $ouwiki = $this->get_new_ouwiki($course->id, OUWIKI_SUBWIKIS_GROUPS);
             $cm = $this->get_new_course_module($course->id, $ouwiki->id, $groupmode);
-            $context = get_context_instance(CONTEXT_MODULE, $cm->instance);
+            $context = context_module::instance($cm->instance);
             $group = $this->get_new_group($course->id);
 
             // subwiki with 'create'
@@ -229,7 +229,7 @@ public function test_ouwiki_get_subwiki() {
         // Test invididual wikis.
         $ouwiki = $this->get_new_ouwiki($course->id, OUWIKI_SUBWIKIS_INDIVIDUAL);
         $cm = $this->get_new_course_module($course->id, $ouwiki->id);
-        $context = get_context_instance(CONTEXT_MODULE, $cm->instance);
+        $context = context_module::instance($cm->instance);
         $groupid = 0;
 
         // subwiki with 'create'
@@ -250,7 +250,7 @@ public function test_ouwiki_pages_and_versions() {
         // setup a wiki to use
         $ouwiki = $this->get_new_ouwiki($course->id, OUWIKI_SUBWIKIS_SINGLE);
         $cm = $this->get_new_course_module($course->id, $ouwiki->id, NOGROUPS);
-        $context = get_context_instance(CONTEXT_MODULE, $cm->instance);
+        $context = context_module::instance($cm->instance);
         $groupid = 0;
         $subwiki = ouwiki_get_subwiki($course, $ouwiki, $cm, $context, $groupid, $user->id, true);
 
@@ -323,7 +323,7 @@ public function test_ouwiki_init_pages() {
         $course = $this->get_new_course();
         $ouwiki = $this->get_new_ouwiki($course->id, OUWIKI_SUBWIKIS_SINGLE);
         $cm = $this->get_new_course_module($course->id, $ouwiki->id, NOGROUPS);
-        $context = get_context_instance(CONTEXT_MODULE, $cm->instance);
+        $context = context_module::instance($cm->instance);
         $groupid = 0;
         $subwiki = ouwiki_get_subwiki($course, $ouwiki, $cm, $context, $groupid, $user->id, true);
 
diff --git a/userparticipation.php b/userparticipation.php
index 2f504aa..053970c 100644
--- a/userparticipation.php
+++ b/userparticipation.php
@@ -57,7 +57,7 @@
 }
 
 $PAGE->set_cm($cm);
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 $PAGE->set_pagelayout('incourse');
 require_course_login($course, true, $cm);
 
diff --git a/view.php b/view.php
index ef7a49b..2915030 100644
--- a/view.php
+++ b/view.php
@@ -32,7 +32,7 @@
 $PAGE->set_url($url);
 $PAGE->set_cm($cm);
 
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 $PAGE->set_pagelayout('incourse');
 require_course_login($course, true, $cm);
 
diff --git a/viewold.php b/viewold.php
index b119ae5..bbcbe8f 100644
--- a/viewold.php
+++ b/viewold.php
@@ -46,7 +46,7 @@
 
     $PAGE->set_cm($cm);
 }
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 $PAGE->set_pagelayout('incourse');
 require_course_login($course, true, $cm);
 $ouwikioutput = $PAGE->get_renderer('mod_ouwiki');
diff --git a/wikihistory.php b/wikihistory.php
index 257bfaf..7096108 100644
--- a/wikihistory.php
+++ b/wikihistory.php
@@ -49,7 +49,7 @@
 
     $PAGE->set_cm($cm);
 }
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 $PAGE->set_pagelayout('incourse');
 require_course_login($course, true, $cm);
 
diff --git a/wikiindex.php b/wikiindex.php
index bd8dfdb..d0286bd 100644
--- a/wikiindex.php
+++ b/wikiindex.php
@@ -48,7 +48,7 @@
 
     $PAGE->set_cm($cm);
 }
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 $PAGE->set_pagelayout('incourse');
 require_course_login($course, true, $cm);
 
@@ -158,7 +158,7 @@
         get_string('format_html', 'ouwiki').'</a></li>';
 
     // Are there any files in this wiki?
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context = context_module::instance($cm->id);
     $result = $DB->get_records_sql("
 SELECT
     f.id