Fixes to package name change