diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php
index 57db9accef4..08d5b3ef73d 100644
--- a/lib/outputrequirementslib.php
+++ b/lib/outputrequirementslib.php
@@ -1250,7 +1250,7 @@ class page_requirements_manager {
 
         $jsrev = $this->get_jsrev();
         $baserollups = array(
-            'rollup/' . $CFG->yui3version . '/simpleyui-min.js',
+            'rollup/' . $CFG->yui3version . '/yui-moodlesimple-min.js',
         );
         $moodlerollups = array(
             'rollup/' . $jsrev . '/mcore-min.js',
diff --git a/theme/yui_combo.php b/theme/yui_combo.php
index 75f44d12a11..d1fe8cb4617 100644
--- a/theme/yui_combo.php
+++ b/theme/yui_combo.php
@@ -93,7 +93,7 @@ while (count($parts)) {
             $filesuffix = '-min.js';
         }
 
-        if (strpos($rollupname, 'simpleyui') !== false) {
+        if (strpos($rollupname, 'yui-moodlesimple') !== false) {
             $yuimodules = array(
                 // Include everything from original SimpleYUI,
                 // this list can be built using http://yuilibrary.com/yui/configurator/ by selecting all modules