Fix #2162 / #2123 - rename packages