Merge "Support old/new package names for widgets."