diff --git a/admin/roles/manage.html b/admin/roles/manage.html
index f8260fdb7cd..8eb65adc849 100755
--- a/admin/roles/manage.html
+++ b/admin/roles/manage.html
@@ -55,7 +55,7 @@ foreach ($capabilities as $capability) {
             if (RISK_MANAGETRUST & (int)$capability->riskbitmask) {
                 echo "T";
             }
-            if (RISK_ADMIN & (int)$capability->riskbitmask) {
+            if (RISK_CONFIG & (int)$capability->riskbitmask) {
                 echo "A";
             }
             if (RISK_XSS & (int)$capability->riskbitmask) {
diff --git a/admin/roles/override.html b/admin/roles/override.html
index 9db29bb2c03..1ad42a3d6e7 100755
--- a/admin/roles/override.html
+++ b/admin/roles/override.html
@@ -88,7 +88,7 @@ if ($courseid) {
                     if (RISK_MANAGETRUST & (int)$capability->riskbitmask) {
                         echo "T";
                     }
-                    if (RISK_ADMIN & (int)$capability->riskbitmask) {
+                    if (RISK_CONFIG & (int)$capability->riskbitmask) {
                         echo "A";
                     }
                     if (RISK_XSS & (int)$capability->riskbitmask) {
diff --git a/lib/accesslib.php b/lib/accesslib.php
index fc5c9e921ed..1f5d8aeb5c2 100755
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -32,7 +32,7 @@ define('CONTEXT_BLOCK', 80);
 
 // capability risks - see http://docs.moodle.org/en/Hardening_new_Roles_system
 define('RISK_MANAGETRUST', 0x0001);
-define('RISK_ADMIN',       0x0002);
+define('RISK_CONFIG',      0x0002);
 define('RISK_XSS',         0x0004);
 define('RISK_PERSONAL',    0x0008);
 define('RISK_SPAM',        0x0010);
diff --git a/lib/db/access.php b/lib/db/access.php
index cc6ebd843bf..13fa9c6299e 100644
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -34,7 +34,7 @@
 $moodle_capabilities = array(
     
     'moodle/site:doanything' => array(
-        'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_ADMIN,
+        'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_CONFIG,
         'captype' => 'admin',
         'contextlevel' => CONTEXT_SYSTEM
     ),
@@ -74,7 +74,7 @@ $moodle_capabilities = array(
     
     
     'moodle/legacy:admin' => array(
-        'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_ADMIN,
+        'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_CONFIG,
         'captype' => 'legacy',
         'contextlevel' => CONTEXT_SYSTEM
     ),
@@ -82,7 +82,7 @@ $moodle_capabilities = array(
     
     'moodle/site:config' => array(
     
-        'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_ADMIN,
+        'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS | RISK_CONFIG,
 
         'captype' => 'write',
         'contextlevel' => CONTEXT_SYSTEM,