diff --git a/admin/report/rolescapabilities/index.php b/admin/report/rolescapabilities/index.php
index bfc0e5d..db278c2 100644
--- a/admin/report/rolescapabilities/index.php
+++ b/admin/report/rolescapabilities/index.php
@@ -32,10 +32,9 @@ echo '<div id="options_container">',
      '<select multiple="multiple" name="roles_ids[]" size="10" id="roles_ids">';
 
 $sql = "SELECT id, name 
-          FROM {$CFG->dbname}.{$CFG->prefix}role
+          FROM {$CFG->prefix}role
          WHERE id IN ({$CFG->report_rolescapabilities_available_roles})
       ORDER BY sortorder ASC";
-echo($sql);
 $available_roles = get_records_sql($sql);
 
 if (!empty($available_roles)) {
@@ -62,7 +61,7 @@ if (empty($roles_ids)) {
     $roles_list = implode(',', $roles_ids);
 
     $sql = "SELECT id,shortname, name
-              FROM {$CFG->dbname}.{$CFG->prefix}role
+              FROM {$CFG->prefix}role
              WHERE id IN ({$roles_list})
           ORDER BY sortorder";
 
@@ -105,7 +104,7 @@ function get_moodle_capabilities($roles) {
     global $CFG;
 
     $sql = "SELECT id, name, component, contextlevel, riskbitmask
-              FROM {$CFG->dbname}.{$CFG->prefix}capabilities
+              FROM {$CFG->prefix}capabilities
              WHERE name NOT LIKE 'moodle/legacy%'
           ORDER BY contextlevel, name";
 
@@ -123,8 +122,8 @@ function get_moodle_capabilities($roles) {
     foreach ($roles as $role) {
 
         $sql = "SELECT rc.capability, rc.permission
-                  FROM {$CFG->dbname}.{$CFG->prefix}role_capabilities rc
-                  JOIN  {$CFG->dbname}.{$CFG->prefix}capabilities c
+                  FROM {$CFG->prefix}role_capabilities rc
+                  JOIN {$CFG->prefix}capabilities c
                     ON c.name = rc.capability
                  WHERE rc.contextid = 1
                    AND rc.roleid = {$role->id}