changes to accommodate package name change