Update for upstream package name change