Be more smarter when choosing file names
Use grunt.util._.extend for better readability
Use short_name instead of name, where needed