Also bind to the machine name
Fixed package title.