Improve name convention and resolution. (Or, installs fail on space character when run in kitchen.)