follow-up fixes to package name change