diff --git a/enrol/imsenterprise/config.html b/enrol/imsenterprise/config.html
index 75820ffb463..58086a483eb 100644
--- a/enrol/imsenterprise/config.html
+++ b/enrol/imsenterprise/config.html
@@ -115,7 +115,7 @@ $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
 $assignableroles = get_assignable_roles($sitecontext);
 $assignableroles = array('0' => get_string('ignore')) + $assignableroles;
 
-foreach(enrolment_plugin_imsenterprise::$imsroles as $imsrolenum=>$imsrolename){
+foreach($this->imsroles as $imsrolenum=>$imsrolename){
 ?>
 <tr valign="top">
     <td align="right">&quot;<?php echo $imsrolename ?>&quot;&nbsp;(<?php echo $imsrolenum ?>):</td>
@@ -125,7 +125,7 @@ foreach(enrolment_plugin_imsenterprise::$imsroles as $imsrolenum=>$imsrolename){
         $configref = "enrol_imse_imsrolemap" . $imsrolenum;
         
         choose_from_menu($assignableroles, 'enrol_imse_imsrolemap'.$imsrolenum, 
-           strlen($frm->$configref) ? $frm->$configref : enrolment_plugin_imsenterprise::determine_default_rolemapping($imsrolenum), '');
+           strlen($frm->$configref) ? $frm->$configref : $this->determine_default_rolemapping($imsrolenum), '');
     ?>
     </td>
     <td>
diff --git a/enrol/imsenterprise/enrol.php b/enrol/imsenterprise/enrol.php
index dd2e4898862..6590f714b69 100644
--- a/enrol/imsenterprise/enrol.php
+++ b/enrol/imsenterprise/enrol.php
@@ -48,7 +48,7 @@ class enrolment_plugin_imsenterprise {
     var $log;    
 
 // The "roles" hard-coded in the IMS specification are:
-public static $imsroles = array(
+var $imsroles = array(
 '01'=>'Learner',
 '02'=>'Instructor',
 '03'=>'Content Developer',
@@ -67,7 +67,7 @@ public static $imsroles = array(
 * decide which role assignments to recommend by default.
 * For example, IMS role '01' is 'Learner', so may map to 'student' in Moodle.
 */
-public static function determine_default_rolemapping($imscode) {
+function determine_default_rolemapping($imscode) {
     switch($imscode) {
         case '01':
         case '04':
@@ -192,7 +192,7 @@ function process_config($config) {
 
 
 
-    foreach(enrolment_plugin_imsenterprise::$imsroles as $imsrolenum=>$imsrolename){
+    foreach($this->imsroles as $imsrolenum=>$imsrolename){
         $configref = 'enrol_imse_imsrolemap' . $imsrolenum;
         if (!isset($config->$configref)) {
             echo "<p>Resetting config->$configref</p>";
@@ -872,7 +872,7 @@ function decode_timeframe($string){ // Pass me the INNER CONTENTS of a <timefram
 */
 function load_role_mappings() {
     $this->rolemappings = array();
-    foreach(enrolment_plugin_imsenterprise::$imsroles as $imsrolenum=>$imsrolename) {
+    foreach($this->imsroles as $imsrolenum=>$imsrolename) {
         $this->rolemappings[$imsrolenum] = $this->rolemappings[$imsrolename]
             = get_field('config', 'value', 'name', 'enrol_imse_imsrolemap' . $imsrolenum);
     }