diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php
index 749787fcd02..4374c77a058 100644
--- a/lib/outputrequirementslib.php
+++ b/lib/outputrequirementslib.php
@@ -658,7 +658,7 @@ class page_requirements_manager {
                                                         array('nofilesavailable', 'repository'), array('norepositoriesavailable', 'repository'),
                                                         array('fileexistsdialogheader', 'repository'), array('fileexistsdialog_editor', 'repository'),
                                                         array('fileexistsdialog_filemanager', 'repository'), array('renameto', 'repository'),
-                                                        array('referencesexist', 'repository'), array('select', 'moodle')
+                                                        array('referencesexist', 'repository'), array('select', 'repository')
                                                     ));
                     break;
                 case 'core_comment':
diff --git a/repository/filepicker.js b/repository/filepicker.js
index b0ade2ea167..88bb6eb71b0 100644
--- a/repository/filepicker.js
+++ b/repository/filepicker.js
@@ -1064,11 +1064,11 @@ M.core_filepicker.init = function(Y, options) {
         select_file: function(args) {
             var argstitle = args.title;
             // Limit the string length so it fits nicely on mobile devices
-            var titlelength = 50;
+            var titlelength = 30;
             if (argstitle.length > titlelength) {
                 argstitle = argstitle.substring(0, titlelength) + '...';
             }
-            Y.one('#fp-file_label_'+this.options.client_id).setContent(Y.Escape.html(M.str.moodle.select+' '+argstitle));
+            Y.one('#fp-file_label_'+this.options.client_id).setContent(Y.Escape.html(M.str.repository.select+' '+argstitle));
             this.selectui.show();
             Y.one('#'+this.selectnode.get('id')).focus();
             var client_id = this.options.client_id;
@@ -1312,7 +1312,7 @@ M.core_filepicker.init = function(Y, options) {
 
             var fplabel = 'fp-file_label_'+ client_id;
             this.selectui = new M.core.dialogue({
-                headerContent: '<span id="' + fplabel +'">'+M.str.moodle.select+'</span>',
+                headerContent: '<span id="' + fplabel +'">'+M.str.repository.select+'</span>',
                 draggable    : true,
                 bodyContent  : this.selectnode,
                 centered     : true,