     watch:
       coffee:
         files: [ "src/coffee/**" ]
-        tasks: [ "coffee:front", "concat:compiledjs", "concat:alljs"]
+        tasks: [ "coffee:front", "concat:js" ]
 
       sass:
         files: [ "src/sass/**" ]
-        tasks: [ "sass:front", "concat:compiledcss", "concat:allcss" ]
+        tasks: [ "sass:front", "concat:css" ]
 
       less:
         files: [ "src/less/**" ]
-        tasks: [ "less:front", "concat:compiledcss", "concat:allcss" ]
+        tasks: [ "less:front", "concat:css" ]
 
-      alljs:
+      js:
         files: [ "#{buildDir}/**.js" ]
-        tasks: [ "concat:alljs", 'uglify:front']
+        tasks: [ "concat:js", 'uglify:front']
 
-      allcss:
+      css:
         files: [ "#{buildDir}/**.css" ]
-        tasks: [ "concat:allcss" ]
+        tasks: [ "concat:css" ]
 
   grunt.registerTask "default", ['coffee', 'sass', 'less', 'bower_concat', 'concat', 'uglify', 'copy']

          expand: true
          cwd: "src/coffee/"
          src: ["*.coffee"]
          dest: "#{buildDir}/front/coffee/"
          ext: ".js"
        }]


          expand: true
          cwd: "src/less/"
          src: ["*.less"]
          dest: "build/less/"
          ext: ".css"
        }]

    bower_concat:
      all:
        dest: "build/bower.js"
        cssDest: "build/bower.css"
        mainFiles:
          'bootstrap': [ "dist/css/bootstrap.css", "dist/js/bootstrap.js"]

    copy:
      bootstrapFonts:
        expand: true
        cwd: "bower_components/bootstrap/dist"
        src: ["fonts/*"]
        dest: "#{buildDir}"

    #Assumes individual files are already minified (no further uglification/minification)
    concat:
