diff --git a/Gruntfile.js b/Gruntfile.js
index 0b6e532..5ee01b6 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -49,7 +49,7 @@ module.exports = function(grunt) {
                     'lib/edit/editsStore.js',
                     'lib/edit/attachmentsStore.js'
                 ],
-                dest: 'dist/offline-editor-edit-src.js'
+                dest: 'dist/offline-edit-src.js'
             },
             /* Tiles basic is for use with WebMaps. Cannot be reloaded or restarted while offline */
             tilesBasic: {
@@ -62,7 +62,7 @@ module.exports = function(grunt) {
                     'lib/tiles/TilesStore.js',
                     'lib/tiles/tilingScheme.js'
                 ],
-                dest: 'dist/offline-editor-tiles-basic-src.js'
+                dest: 'dist/offline-tiles-basic-src.js'
             },
             /* Tiles advanced is for use with tiled map services. Works with reload or restart while offline */
             tilesAdvanced: {
@@ -75,20 +75,20 @@ module.exports = function(grunt) {
                     'lib/tiles/tilingScheme.js',
                     'lib/tiles/offlineTilesEnablerLayer.js'
                 ],
-                dest: 'dist/offline-editor-tiles-advanced-src.js'
+                dest: 'dist/offline-tiles-advanced-src.js'
             },
             /* TPKLayer - for working directly with tile packages (.tpk files) */
             tpk: {
                 src: [
-                    'lib/tpk/TPKLayer.js',
                     'lib/tpk/OfflineTpkNS.js',
+                    'lib/tpk/TPKLayer.js',
                     'lib/tiles/TilesStore.js',
                     'lib/tpk/zip.js',
                     'lib/tpk/autoCenterMap.js',
                     'lib/tpk/inflate.js',
                     'lib/tpk/xml2json.js'
                 ],
-                dest: 'dist/offline-editor-tpk-src.js'
+                dest: 'dist/offline-tpk-src.js'
             }
         },
 
@@ -104,10 +104,10 @@ module.exports = function(grunt) {
             },
             dist: {
                 files: {
-                    'dist/offline-editor-edit.js': ['dist/offline-editor-edit-src.js'],
-                    'dist/offline-editor-tiles-basic-min.js': ['dist/offline-editor-tiles-basic-src.js'],
-                    'dist/offline-editor-tiles-advanced-min.js': ['dist/offline-editor-tiles-advanced-src.js'],
-                    'dist/offline-editor-tpk.js': ['dist/offline-editor-tpk-src.js']
+                    'dist/offline-edit-min.js': ['dist/offline-edit-src.js'],
+                    'dist/offline-tiles-basic-min.js': ['dist/offline-tiles-basic-src.js'],
+                    'dist/offline-tiles-advanced-min.js': ['dist/offline-tiles-advanced-src.js'],
+                    'dist/offline-tpk-min.js': ['dist/offline-tpk-src.js']
                 }
             }
         }
diff --git a/samples/Gruntfile.js b/samples/Gruntfile.js
index 50f7b5b..2622387 100644
--- a/samples/Gruntfile.js
+++ b/samples/Gruntfile.js
@@ -29,7 +29,7 @@ module.exports = function(grunt) {
                         "<%= pkg.optimizedApiURL %>/dojo/nls/dojo_en-us.js",
                         "<%= pkg.optimizedApiURL %>/dojo/selector/acme.js",
                         "#",
-                        "<%= pkg.arcGISBaseURL %>/js/esri/dijit/images/popup-sprite.png",
+                        "#<%= pkg.arcGISBaseURL %>/js/esri/dijit/images/popup-sprite.png",
                         "<%= pkg.arcGISBaseURL %>/js/esri/dijit/images/attribute_inspector_sprite.png",
 						"<%= pkg.arcGISBaseURL %>/js/dojo/dojox/gfx/svg.js",
 						"<%= pkg.arcGISBaseURL %>/js/dojo/dojo/resources/blank.gif",
@@ -68,9 +68,9 @@ module.exports = function(grunt) {
                     "../lib/tiles/*.png",
                     "../lib/tiles/*.psd",
                     "../utils/*.js",
-                    "../dist/offline-editor-edit-src.js",
-                    "../dist/offline-editor-tiles-advanced-src.js",
-                    "../dist/offline-editor-tiles-basic-src.js"
+                    "../dist/offline-edit-src.js",
+                    "../dist/offline-tiles-advanced-src.js",
+                    "../dist/offline-tiles-basic-src.js"
                     /*
                     "images/*",
                     "css/*.css"