Tweaks to package names