diff --git a/mod/folder/edit.php b/mod/folder/edit.php
index 0b74e47a144..f6aec48119b 100644
--- a/mod/folder/edit.php
+++ b/mod/folder/edit.php
@@ -32,7 +32,7 @@ require_once("$CFG->dirroot/repository/lib.php");
 $id = required_param('id', PARAM_INT);  // Course module ID
 
 $cm = get_coursemodule_from_id('folder', $id, 0, false, MUST_EXIST);
-$context = get_context_instance(CONTEXT_MODULE, $cm->id, MUST_EXIST);
+$context = context_module::instance($cm->id, MUST_EXIST);
 $folder = $DB->get_record('folder', array('id'=>$cm->instance), '*', MUST_EXIST);
 $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 
diff --git a/mod/folder/lib.php b/mod/folder/lib.php
index fde1587f516..f349146494d 100644
--- a/mod/folder/lib.php
+++ b/mod/folder/lib.php
@@ -98,7 +98,7 @@ function folder_add_instance($data, $mform) {
 
     // we need to use context now, so we need to make sure all needed info is already in db
     $DB->set_field('course_modules', 'instance', $data->id, array('id'=>$cmid));
-    $context = get_context_instance(CONTEXT_MODULE, $cmid);
+    $context = context_module::instance($cmid);
 
     if ($draftitemid) {
         file_save_draft_area_files($draftitemid, $context->id, 'mod_folder', 'content', 0, array('subdirs'=>true));
@@ -125,7 +125,7 @@ function folder_update_instance($data, $mform) {
 
     $DB->update_record('folder', $data);
 
-    $context = get_context_instance(CONTEXT_MODULE, $cmid);
+    $context = context_module::instance($cmid);
     if ($draftitemid = file_get_submitted_draft_itemid('files')) {
         file_save_draft_area_files($draftitemid, $context->id, 'mod_folder', 'content', 0, array('subdirs'=>true));
     }
@@ -334,7 +334,7 @@ function folder_page_type_list($pagetype, $parentcontext, $currentcontext) {
 function folder_export_contents($cm, $baseurl) {
     global $CFG, $DB;
     $contents = array();
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context = context_module::instance($cm->id);
     $folder = $DB->get_record('folder', array('id'=>$cm->instance), '*', MUST_EXIST);
 
     $fs = get_file_storage();
diff --git a/mod/folder/renderer.php b/mod/folder/renderer.php
index 539affef4d6..c99ca6cd436 100644
--- a/mod/folder/renderer.php
+++ b/mod/folder/renderer.php
@@ -98,7 +98,7 @@ class folder_tree implements renderable {
         $this->cm     = $cm;
         $this->course = $course;
 
-        $this->context = get_context_instance(CONTEXT_MODULE, $cm->id);
+        $this->context = context_module::instance($cm->id);
         $fs = get_file_storage();
         $this->dir = $fs->get_area_tree($this->context->id, 'mod_folder', 'content', 0);
     }
diff --git a/mod/folder/view.php b/mod/folder/view.php
index afe90f12456..4a8960acfeb 100644
--- a/mod/folder/view.php
+++ b/mod/folder/view.php
@@ -44,7 +44,7 @@ if ($f) {  // Two ways to specify the module
 $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 
 require_course_login($course, true, $cm);
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 require_capability('mod/folder:view', $context);
 
 add_to_log($course->id, 'folder', 'view', 'view.php?id='.$cm->id, $folder->id, $cm->id);