Fix #2162 / #2123 - rename packages
1.1 release - merge nightly config to stable