more tweaks to get package names right