Fix package names to reflect new namespacing