diff --git a/mod/survey/download.php b/mod/survey/download.php
index 562e84e2040..d3ba15893f4 100644
--- a/mod/survey/download.php
+++ b/mod/survey/download.php
@@ -40,7 +40,7 @@ if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
     print_error('coursemisconf');
 }
 
-$context = get_context_instance(CONTEXT_MODULE, $cm->id);
+$context = context_module::instance($cm->id);
 
 $PAGE->set_url('/mod/survey/download.php', array('id'=>$id, 'type'=>$type, 'group'=>$group));
 
@@ -146,7 +146,7 @@ foreach ($surveyanswers as $surveyanswer) {
 }
 
 // Output the file as a valid ODS spreadsheet if required
-$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+$coursecontext = context_course::instance($course->id);
 $courseshortname = format_string($course->shortname, true, array('context' => $coursecontext));
 
 if ($type == "ods") {
diff --git a/mod/survey/graph.php b/mod/survey/graph.php
index 14dabc107fd..7422e7d0b3e 100644
--- a/mod/survey/graph.php
+++ b/mod/survey/graph.php
@@ -39,7 +39,7 @@
     require_login($course, false, $cm);
 
     $groupmode = groups_get_activity_groupmode($cm);   // Groups are being used
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context = context_module::instance($cm->id);
 
     if (!has_capability('mod/survey:readresponses', $context)) {
         if ($type != "student.png" or $sid != $USER->id ) {
diff --git a/mod/survey/report.php b/mod/survey/report.php
index a5a641d822b..ab1af08986b 100644
--- a/mod/survey/report.php
+++ b/mod/survey/report.php
@@ -63,7 +63,7 @@
 
     require_login($course, false, $cm);
 
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context = context_module::instance($cm->id);
 
     require_capability('mod/survey:readresponses', $context);
 
diff --git a/mod/survey/save.php b/mod/survey/save.php
index 7fde436276e..334ac1c106b 100644
--- a/mod/survey/save.php
+++ b/mod/survey/save.php
@@ -47,7 +47,7 @@
     $PAGE->set_url('/mod/survey/save.php', array('id'=>$id));
     require_login($course, false, $cm);
 
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context = context_module::instance($cm->id);
     require_capability('mod/survey:participate', $context);
 
     if (! $survey = $DB->get_record("survey", array("id"=>$cm->instance))) {
diff --git a/mod/survey/view.php b/mod/survey/view.php
index cfb421a86db..4fce01a8eaf 100644
--- a/mod/survey/view.php
+++ b/mod/survey/view.php
@@ -38,7 +38,7 @@
 
     $PAGE->set_url('/mod/survey/view.php', array('id'=>$id));
     require_login($course, false, $cm);
-    $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $context = context_module::instance($cm->id);
 
     require_capability('mod/survey:participate', $context);