Add shell and fix bundle name