Correct package names for rebranding

These changes may be slated somewhere to be made already, but we might as well make them now.