Name argument should be inferred in most cases. Also use :name instead of :bundle-name in most places to be terser and simpler.