Better class names
Fix invoking rake tasks with arguments