Merge "Use the correct package name for CHOOSER"