diff --git a/modules/gallery/controllers/javascript.php b/modules/gallery/controllers/combined.php
similarity index 95%
rename from modules/gallery/controllers/javascript.php
rename to modules/gallery/controllers/combined.php
index ba5cbf4b..510482db 100644
--- a/modules/gallery/controllers/javascript.php
+++ b/modules/gallery/controllers/combined.php
@@ -17,8 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Javascript_Controller extends Controller {
-  public function combined($key) {
+class Combined_Controller extends Controller {
+  public function javascript($key) {
     if (preg_match('/[^0-9a-f]/', $key)) {
       // The key can't contain non-hex, so just terminate early
       Kohana::show_404();
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index c3acfeb3..25818821 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -207,7 +207,7 @@ class Theme_View_Core extends View {
     }
 
     // Handcraft the script link because html::script will add a .js extenstion
-    return "<script type=\"text/javascript\" src=\"" . url::site("javascript/combined/$key") .
+    return "<script type=\"text/javascript\" src=\"" . url::site("combined/javascript/$key") .
       "\"></script>";
   }