diff --git a/lib/db/access.php b/lib/db/access.php
index 1d3f5985712..1ae53d581a9 100644
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -167,7 +167,7 @@ $capabilities = array(
         'clonepermissionsfrom' =>  'moodle/site:backup'
     ),
 
-    'moodle/site:backupdownload' => array(
+    'moodle/backup:downloadfile' => array(
 
         'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
 
@@ -178,21 +178,7 @@ $capabilities = array(
             'admin' => CAP_ALLOW
         ),
 
-        'clonepermissionsfrom' =>  'moodle/site:backup'
-    ),
-
-    'moodle/site:backupupload' => array(
-
-        'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
-
-        'captype' => 'write',
-        'contextlevel' => CONTEXT_COURSE,
-        'legacy' => array(
-            'editingteacher' => CAP_ALLOW,
-            'admin' => CAP_ALLOW
-        ),
-
-        'clonepermissionsfrom' =>  'moodle/site:restore'
+        'clonepermissionsfrom' =>  'moodle/site:backupdownload'
     ),
 
     'moodle/backup:userinfo' => array(
@@ -220,6 +206,20 @@ $capabilities = array(
         'clonepermissionsfrom' =>  'moodle/site:restore'
     ),
 
+    'moodle/restore:uploadfile' => array(
+
+        'riskbitmask' => RISK_SPAM | RISK_PERSONAL | RISK_XSS,
+
+        'captype' => 'write',
+        'contextlevel' => CONTEXT_COURSE,
+        'legacy' => array(
+            'editingteacher' => CAP_ALLOW,
+            'admin' => CAP_ALLOW
+        ),
+
+        'clonepermissionsfrom' =>  'moodle/site:backupupload'
+    ),
+
     'moodle/restore:createuser' => array(
 
         'riskbitmask' => RISK_SPAM | RISK_PERSONAL,
diff --git a/lib/file/file_browser.php b/lib/file/file_browser.php
index d773dc764b7..3e6fe1ef804 100644
--- a/lib/file/file_browser.php
+++ b/lib/file/file_browser.php
@@ -387,8 +387,8 @@ class file_browser {
             }
         }
 
-        $downloadable = has_capability('moodle/site:backupdownload', $context);
-        $uploadable   = has_capability('moodle/site:backupupload', $context);
+        $downloadable = has_capability('moodle/backup:downloadfile', $context);
+        $uploadable   = has_capability('moodle/backup:uploadfile', $context);
         return new file_info_stored($this, $context, $storedfile, $urlbase, get_string('areabackup', 'repository'), false, $downloadable, $uploadable, false);
 
     }
diff --git a/pluginfile.php b/pluginfile.php
index 55e9aa43bfd..a46cc14e6c6 100644
--- a/pluginfile.php
+++ b/pluginfile.php
@@ -281,7 +281,7 @@ if (!empty($sendflashupgrader) && (($userplayerversion[0] <  $requiredplayervers
 
     if ($filearea === 'course_backup') {
         require_login($course);
-        require_capability('moodle/site:backupdownload', $context);
+        require_capability('moodle/backup:downloadfile', $context);
 
         $relativepath = '/'.implode('/', $args);
         $fullpath = $context->id.'course_backup0'.$relativepath;