diff --git a/lib/mappings.js b/lib/mappings.js
index 69d733d2ba68c3d2190a791ef66e28f7e0fa84bf..2c15c7b5345c51d9e9776a603a12cb5b1ccb229a 100644
--- a/lib/mappings.js
+++ b/lib/mappings.js
@@ -29,46 +29,52 @@ var mappings = {
     'ajax.googleapis.com': {
         '/ajax/libs/': {
             'angularjs/{version}/angular.': resources.angular,
-            'dojo/{version}/dojo/dojo': resources.dojo,
-            'ext-core/{version}/ext-core': resources.extCore,
-            'jquery/{version}/jquery': resources.jQuery,
-            'jqueryui/{version}/jquery-ui': resources.jQueryUI,
-            'mootools/{version}/mootools-yui-compressed': resources.mootools,
-            'prototype/{version}/prototype': resources.prototypeJS,
-            'scriptaculous/{version}/scriptaculous': resources.scriptaculous,
-            'swfobject/{version}/swfobject': resources.swfobject,
-            'webfont/{version}/webfont': resources.webfont,
+            'dojo/{version}/dojo/dojo.': resources.dojo,
+            'ext-core/{version}/ext-core.': resources.extCore,
+            'ext-core/{version}/ext-core-debug.': resources.extCore,
+            'jquery/{version}/jquery.': resources.jQuery,
+            'jqueryui/{version}/jquery-ui.js': resources.jQueryUI,
+            'jqueryui/{version}/jquery-ui.min.js': resources.jQueryUI,
+            'mootools/{version}/mootools-yui-compressed.': resources.mootools,
+            'prototype/{version}/prototype.': resources.prototypeJS,
+            'scriptaculous/{version}/scriptaculous.': resources.scriptaculous,
+            'swfobject/{version}/swfobject.': resources.swfobject,
+            'webfont/{version}/webfont.': resources.webfont,
 
             // Common Shorthand Notations
-            'dojo/1/dojo/dojo': {
+            'dojo/1/dojo/dojo.': {
                 path: 'resources/dojo/1.6.1/dojo/dojo.js.dec',
                 type: 'application/javascript'
             },
-            'jquery/1/jquery': {
+            'jquery/1/jquery.': {
                 path: 'resources/jquery/1.11.1/jquery.min.js.dec',
                 type: 'application/javascript'
             },
-            'jqueryui/1/jquery-ui': {
+            'jqueryui/1/jquery-ui.js': {
                 path: 'resources/jqueryui/1.10.4/jquery-ui.min.js.dec',
                 type: 'application/javascript'
             },
-            'mootools/1/mootools-yui-compressed': {
+            'jqueryui/1/jquery-ui.min.js': {
+                path: 'resources/jqueryui/1.10.4/jquery-ui.min.js.dec',
+                type: 'application/javascript'
+            },
+            'mootools/1/mootools-yui-compressed.': {
                 path: 'resources/mootools/1.1.2/mootools-yui-compressed.js.dec',
                 type: 'application/javascript'
             },
-            'prototype/1/prototype': {
+            'prototype/1/prototype.': {
                 path: 'resources/prototype/1.7.1.0/prototype.js.dec',
                 type: 'application/javascript'
             },
-            'scriptaculous/1/scriptaculous': {
+            'scriptaculous/1/scriptaculous.': {
                 path: 'resources/scriptaculous/1.9.0/scriptaculous.js.dec',
                 type: 'application/javascript'
             },
-            'swfobject/2/swfobject': {
+            'swfobject/2/swfobject.': {
                 path: 'resources/swfobject/2.2/swfobject.js.dec',
                 type: 'application/javascript'
             },
-            'webfont/1/webfont': {
+            'webfont/1/webfont.': {
                 path: 'resources/webfont/1.5.18/webfont.js.dec',
                 type: 'application/javascript'
             }
@@ -77,48 +83,51 @@ var mappings = {
     // Microsoft Ajax CDN
     'ajax.aspnetcdn.com': {
         '/ajax/': {
-            'jQuery/jquery-{version}': resources.jQuery,
-            'modernizr/modernizr-{version}': resources.modernizr
+            'jQuery/jquery-{version}.': resources.jQuery,
+            'modernizr/modernizr-{version}.': resources.modernizr
         }
     },
     // Microsoft Ajax CDN [Deprecated]
     'ajax.microsoft.com': {
         '/ajax/': {
-            'jQuery/jquery-{version}': resources.jQuery,
-            'modernizr/modernizr-{version}': resources.modernizr
+            'jQuery/jquery-{version}.': resources.jQuery,
+            'modernizr/modernizr-{version}.': resources.modernizr
         }
     },
     // CDNJS (Cloudflare)
     'cdnjs.cloudflare.com': {
         '/ajax/libs/': {
-            'angular.js/{version}/angular': resources.angular,
-            'backbone.js/{version}/backbone': resources.backbone,
-            'dojo/{version}/dojo': resources.dojo,
-            'ember.js/{version}/ember': resources.ember,
-            'ext-core/{version}/ext-core': resources.extCore,
-            'jquery/{version}/jquery': resources.jQuery,
-            'jqueryui/{version}/jquery-ui': resources.jQueryUI,
-            'modernizr/{version}/modernizr': resources.modernizr,
+            'angular.js/{version}/angular.': resources.angular,
+            'backbone.js/{version}/backbone.': resources.backbone,
+            'backbone.js/{version}/backbone-min.': resources.backbone,
+            'dojo/{version}/dojo.': resources.dojo,
+            'ember.js/{version}/ember.': resources.ember,
+            'ext-core/{version}/ext-core.': resources.extCore,
+            'jquery/{version}/jquery.': resources.jQuery,
+            'jqueryui/{version}/jquery-ui.js': resources.jQueryUI,
+            'jqueryui/{version}/jquery-ui.min.js': resources.jQueryUI,
+            'modernizr/{version}/modernizr.': resources.modernizr,
             'mootools/{version}/mootools-core': resources.mootools,
-            'prototype/{version}/prototype': resources.prototypeJS,
-            'scriptaculous/{version}/scriptaculous': resources.scriptaculous,
-            'swfobject/{version}/swfobject': resources.swfobject,
-            'underscore.js/{version}/underscore': resources.underscore,
+            'scriptaculous/{version}/scriptaculous.': resources.scriptaculous,
+            'swfobject/{version}/swfobject.': resources.swfobject,
+            'underscore.js/{version}/underscore.': resources.underscore,
+            'underscore.js/{version}/underscore-min.': resources.underscore,
             'webfont/{version}/webfont': resources.webfont
         }
     },
     // jQuery CDN (MaxCDN)
     'code.jquery.com': {
         '/': {
-            'jquery-{version}': resources.jQuery,
-            'ui/{version}/jquery-ui': resources.jQueryUI,
+            'jquery-{version}.': resources.jQuery,
+            'ui/{version}/jquery-ui.js': resources.jQueryUI,
+            'ui/{version}/jquery-ui.min.js': resources.jQueryUI,
 
             // Common Shorthand Notations
-            'jquery-latest': {
+            'jquery-latest.': {
                 path: 'resources/jquery/1.11.1/jquery.min.js.dec',
                 type: 'application/javascript'
             },
-            'jquery': {
+            'jquery.': {
                 path: 'resources/jquery/1.11.1/jquery.min.js.dec',
                 type: 'application/javascript'
             }
@@ -128,16 +137,17 @@ var mappings = {
     'cdn.jsdelivr.net': {
         '/': {
             'angularjs/{version}/angular.': resources.angular,
-            'backbonejs/{version}/backbone': resources.backbone,
-            'dojo/{version}/dojo': resources.dojo,
-            'emberjs/{version}/ember': resources.ember,
-            'jquery/{version}/jquery': resources.jQuery,
-            'jquery.ui/{version}/jquery-ui': resources.jQueryUI,
-            'mootools/{version}/mootools': resources.mootools,
-            'prototypejs/{version}/prototype': resources.prototypeJS,
-            'scriptaculous/{version}/scriptaculous': resources.scriptaculous,
-            'swfobject/{version}/swfobject': resources.swfobject,
-            'underscorejs/{version}/underscore': resources.underscore,
+            'backbonejs/{version}/backbone.': resources.backbone,
+            'backbonejs/{version}/backbone-min.': resources.backbone,
+            'dojo/{version}/dojo.': resources.dojo,
+            'emberjs/{version}/ember.': resources.ember,
+            'jquery/{version}/jquery.': resources.jQuery,
+            'jquery.ui/{version}/jquery-ui.js': resources.jQueryUI,
+            'jquery.ui/{version}/jquery-ui.min.js': resources.jQueryUI,
+            'mootools/{version}/mootools-': resources.mootools,
+            'swfobject/{version}/swfobject.': resources.swfobject,
+            'underscorejs/{version}/underscore.': resources.underscore,
+            'underscorejs/{version}/underscore-min.': resources.underscore,
             'webfontloader/{version}/webfont': resources.webfont
         }
     },
@@ -145,61 +155,72 @@ var mappings = {
     'yandex.st': {
         '/': {
             'angularjs/{version}/angular.': resources.angular,
-            'backbone/{version}/backbone': resources.backbone,
-            'dojo/{version}/dojo/dojo': resources.dojo,
-            'ext-core/{version}/ext-core': resources.extCore,
-            'jquery/{version}/jquery': resources.jQuery,
-            'jquery-ui/{version}/jquery': resources.jQueryUI,
-            'modernizr/{version}/modernizr': resources.modernizr,
-            'mootools/{version}/mootools': resources.mootools,
-            'prototype/{version}/prototype': resources.prototypeJS,
-            'scriptaculous/{version}/': resources.scriptaculous,
-            'underscore/{version}/underscore': resources.underscore,
-            'swfobject/{version}/swfobject': resources.swfobject
+            'backbone/{version}/backbone.': resources.backbone,
+            'backbone/{version}/backbone-min.': resources.backbone,
+            'dojo/{version}/dojo/dojo.': resources.dojo,
+            'ext-core/{version}/ext-core.': resources.extCore,
+            'jquery/{version}/jquery.': resources.jQuery,
+            'jquery-ui/{version}/jquery-ui.js': resources.jQueryUI,
+            'jquery-ui/{version}/jquery-ui.min.js': resources.jQueryUI,
+            'modernizr/{version}/modernizr.': resources.modernizr,
+            'prototype/{version}/prototype.': resources.prototypeJS,
+            'scriptaculous/{version}/scriptaculous.': resources.scriptaculous,
+            'swfobject/{version}/swfobject.': resources.swfobject,
+            'underscore/{version}/underscore.': resources.underscore,
+            'underscore/{version}/underscore-min.': resources.underscore
         }
     },
     // Baidu CDN
     'libs.baidu.com': {
         '/': {
-            'backbone/{version}/backbone': resources.backbone,
-            'dojo/{version}/dojo': resources.dojo,
-            'ext-core/{version}/ext-core': resources.extCore,
-            'jquery/{version}/jquery': resources.jQuery,
-            'jqueryui/{version}/jquery-ui': resources.jQueryUI,
-            'mootools/{version}/mootools-yui-compressed': resources.mootools,
-            'prototype/{version}/prototype': resources.prototypeJS,
-            'scriptaculous/{version}/scriptaculous': resources.scriptaculous,
-            'swfobject/{version}/swfobject': resources.swfobject,
-            'underscore/{version}/underscore': resources.underscore,
-            'webfont/{version}/webfont': resources.webfont
+            'backbone/{version}/backbone.': resources.backbone,
+            'backbone/{version}/backbone-min.': resources.backbone,
+            'dojo/{version}/dojo.': resources.dojo,
+            'ext-core/{version}/ext-core.': resources.extCore,
+            'jquery/{version}/jquery.': resources.jQuery,
+            'jqueryui/{version}/jquery-ui.js': resources.jQueryUI,
+            'jqueryui/{version}/jquery-ui.min.js': resources.jQueryUI,
+            'mootools/{version}/mootools-yui-compressed.': resources.mootools,
+            'prototype/{version}/prototype.': resources.prototypeJS,
+            'scriptaculous/{version}/scriptaculous.': resources.scriptaculous,
+            'swfobject/{version}/swfobject.': resources.swfobject,
+            'underscore/{version}/underscore.': resources.underscore,
+            'underscore/{version}/underscore-min.': resources.underscore,
+            'webfont/{version}/webfont.': resources.webfont,
+            'webfont/{version}/webfont_debug.': resources.webfont
         }
     },
     // Sina Public Resources
     'lib.sinaapp.com': {
         '/js/': {
-            'angular.js/angular-{version}': resources.angular,
-            'backbone/{version}/backbone': resources.backbone,
-            'dojo/{version}/dojo': resources.dojo,
-            'ext-core/{version}/ext-core': resources.extCore,
-            'jquery/{version}/jquery': resources.jQuery,
-            'jquery-ui/{version}/jquery-ui': resources.jQueryUI,
-            'mootools/{version}/mootools': resources.mootools,
-            'prototype/{version}/prototype': resources.prototypeJS,
-            'scriptaculous/{version}/scriptaculous': resources.scriptaculous,
-            'swfobject/{version}/swfobject': resources.swfobject,
-            'underscore/{version}/underscore': resources.underscore,
-            'webfont/{version}/webfont': resources.webfont
+            'angular.js/angular-{version}/angular.': resources.angular,
+            'backbone/{version}/backbone.': resources.backbone,
+            'dojo/{version}/dojo.': resources.dojo,
+            'ext-core/{version}/ext-core.': resources.extCore,
+            'ext-core/{version}/ext-core-debug.': resources.extCore,
+            'jquery/{version}/jquery.': resources.jQuery,
+            'jquery-ui/{version}/jquery-ui.js': resources.jQueryUI,
+            'jquery-ui/{version}/jquery-ui.min.js': resources.jQueryUI,
+            'mootools/{version}/mootools.': resources.mootools,
+            'prototype/{version}/prototype.': resources.prototypeJS,
+            'scriptaculous/{version}/scriptaculous.': resources.scriptaculous,
+            'swfobject/{version}/swfobject.': resources.swfobject,
+            'underscore/{version}/underscore.': resources.underscore,
+            'underscore/{version}/underscore-min.': resources.underscore,
+            'webfont/{version}/webfont.': resources.webfont,
+            'webfont/{version}/webfont_debug.': resources.webfont
         }
     },
     // UpYun Library
     'upcdn.b0.upaiyun.com': {
         '/libs/': {
-            'dojo/dojo-{version}': resources.dojo,
-            'emberjs/emberjs-{version}': resources.ember,
-            'jquery/jquery-{version}': resources.jQuery,
-            'jqueryui/jquery.ui-{version}': resources.jQueryUI,
-            'modernizr/modernizr-{version}': resources.modernizr,
-            'mootoolscore/mootools.core-{version}': resources.mootools
+            'dojo/dojo-{version}.': resources.dojo,
+            'emberjs/emberjs-{version}.': resources.ember,
+            'jquery/jquery-{version}.': resources.jQuery,
+            'jqueryui/jquery.ui-{version}.js': resources.jQueryUI,
+            'jqueryui/jquery.ui-{version}.min.js': resources.jQueryUI,
+            'modernizr/modernizr-{version}.': resources.modernizr,
+            'mootoolscore/mootools.core-{version}.': resources.mootools
         }
     }
 };